freshlybakedca.ke
Git fork
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>
authored by
Elijah Newren
and committed by
Junio C Hamano
b5dff2bd
5b97a56f
+5
-5
builtin/checkout.c
+5
-5
builtin/checkout.c
···
17
17
#include "merge-ll.h"
18
18
#include "lockfile.h"
19
19
#include "mem-pool.h"
20
-
#include "merge-recursive.h"
20
+
#include "merge-ort-wrappers.h"
21
21
#include "object-name.h"
22
22
#include "object-store-ll.h"
23
23
#include "parse-options.h"
···
907
907
o.branch1 = new_branch_info->name;
908
908
o.branch2 = "local";
909
909
o.conflict_style = opts->conflict_style;
910
-
ret = merge_trees(&o,
911
-
new_tree,
912
-
work,
913
-
old_tree);
910
+
ret = merge_ort_nonrecursive(&o,
911
+
new_tree,
912
+
work,
913
+
old_tree);
914
914
if (ret < 0)
915
915
exit(128);
916
916
ret = reset_tree(new_tree,