Upgrade

[hhugo]

• upgrade ocamlformat
• upgrade core (used for test)
• upgrade cmdliner
• update tests with new git version

[Khady]

tests aren't passing for me on master. Is there a specific git version or config that is required?

File "test/resolve2.ml", line 1, characters 0-0:
------ test/resolve2.ml
++++++ test/resolve2.ml.corrected
File "test/resolve2.ml", line 44, characters 0-1:
 |      [%expect {||}];
 |      git_checkout "branch1";
 |      write "a.ml"
 |        {|
 |type t =
 |  { a : int option;
 |    b : string;
 |    c : float;
 |  }
 ||};
 |      git_commit "second commit (fork)";
 |      git_branch "old_branch1";
 |      [%expect {| Switched to branch 'branch1' |}];
 |      system "git rebase branch2 -q";
 |      [%expect
 |        {|
-|        Auto-merging b.ml
-|        CONFLICT (content): Merge conflict in b.ml
-|        error: could not apply a93a935... second commit (fork)
-|        hint: Resolve all conflicts manually, mark them as resolved with
-|        hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-|        hint: You can instead skip this commit: run "git rebase --skip".
-|        hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-|        Could not apply a93a935... second commit (fork)
+|        error: could not apply 7ebbb77... second commit (fork)
+|        Resolve all conflicts manually, mark them as resolved with
+|        "git add/rm <conflicted_files>", then run "git rebase --continue".
+|        You can instead skip this commit: run "git rebase --skip".
+|        To abort and get back to the state before "git rebase", run "git rebase --abort".
+|        Recorded preimage for 'b.ml'
+|        Could not apply 7ebbb77... second commit (fork)
+|        Auto-merging b.ml
+|        CONFLICT (content): Merge conflict in b.ml
 |        Exit with 1 |}];
 |      print_status ();
 |      [%expect
 |        {|
 |        UU File b.ml
 |
 |        <<<<<<< HEAD:b.ml
 |        type t = { a : int;
 |                   b : string;
 |                   c : float;
 |                   d : unit option
 |                 }
+|        ||||||| parent of 7ebbb77 (second commit (fork)):a.ml
+|        type t = { a : int;
+|                   b : string;
+|                   c : float;
+|                 }
 |        =======
 |        type t =
 |          { a : int option;
 |            b : string;
 |            c : float;
 |          }
-|        >>>>>>> a93a935 (second commit (fork)):a.ml |}];
+|        >>>>>>> 7ebbb77 (second commit (fork)):a.ml |}];
 |      resolve ();
 |      [%expect {| Resolved 1/1 b.ml |}];
 |      print_status ();
 |      [%expect
 |        {|
 |        M File b.ml
 |        type t =
 |          { a : int option
 |          ; b : string
 |          ; c : float
 |          ; d : unit option
 |          } |}];
 |      system "git rebase --continue";
 |      [%expect {|
-|        [detached HEAD 0a0bd2c] second commit (fork)
+|        Recorded resolution for 'b.ml'.
+|        [detached HEAD 9acc7a1] second commit (fork)
 |         1 file changed, 6 insertions(+), 6 deletions(-) |}])