gazagnaire.org / ocaml-merge3
3-way merge with Myers diff
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

csv: rename from csvt

Drops the redundant "t" suffix. Library name, opam package, module
(Csvt -> Csv), and directory all rename in lockstep. Every downstream
reference in interop tests, libraries, and docs updated.

Thomas Gazagnaire 8313d398 d0e123ce

+3 -3
+1 -1
test/interop/git/dune
··· 1 1 (test 2 2 (name test) 3 - (libraries merge3 csvt alcotest) 3 + (libraries merge3 csv alcotest) 4 4 (deps 5 5 (source_tree traces) 6 6 (source_tree scripts)))
+2 -2
test/interop/git/test.ml
··· 32 32 } 33 33 34 34 let case_codec = 35 - Csvt.( 35 + Csv.( 36 36 Row.( 37 37 obj (fun name base_hex ours_hex theirs_hex exit_code merged_hex -> 38 38 { ··· 52 52 |> finish)) 53 53 54 54 let parse_cases () = 55 - match Csvt.decode_file case_codec (trace "cases.csv") with 55 + match Csv.decode_file case_codec (trace "cases.csv") with 56 56 | Ok rows -> rows 57 57 | Error e -> Alcotest.failf "cases.csv: %s" e 58 58