Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
get_merge_bases(): always clean-up object flags
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index d38a3b2eb5bf4b0940a2aa4d5c32f02b9f35cc15..0b7bb6d547b16ff124bac111d6d338bd3214b2e2 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-1904,7
+1904,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);
}