Merge branch 'jc/diff-format-doc' into maint

diff --git a/merge-recursive.c b/merge-recursive.c
index 25c067e4a71f1ed2c5d4971d41ab6b4e1108e9e4..771f5e21b09aac6976297b8a6e9028f90787a764 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1901,7 +1901,7 @@ int merge_recursive(struct merge_options *o,
        }
 
        if (!ca) {
-               ca = get_merge_bases(h1, h2, 1);
+               ca = get_merge_bases(h1, h2);
                ca = reverse_commit_list(ca);
        }