checkout: replace merge_trees() with merge_ort_nonrecursive()

Replace the use of merge_trees() from merge-recursive.[ch] with the
merge-ort equivalent.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 01ea9ff8b28022d718fa1368ac7144c8d9b4a1a3..67879e723627fa38323a8b3e93679d7c2ccfc75e 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -17,7 +17,7 @@
 #include "merge-ll.h"
 #include "lockfile.h"
 #include "mem-pool.h"
-#include "merge-recursive.h"
+#include "merge-ort-wrappers.h"
 #include "object-name.h"
 #include "object-store-ll.h"
 #include "parse-options.h"
@@ -907,10 +907,10 @@ static int merge_working_tree(const struct checkout_opts *opts,
                        o.branch1 = new_branch_info->name;
                        o.branch2 = "local";
                        o.conflict_style = opts->conflict_style;
-                       ret = merge_trees(&o,
-                                         new_tree,
-                                         work,
-                                         old_tree);
+                       ret = merge_ort_nonrecursive(&o,
+                                                    new_tree,
+                                                    work,
+                                                    old_tree);
                        if (ret < 0)
                                exit(128);
                        ret = reset_tree(new_tree,