Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/diff-format-doc' into maint
[gitweb.git]
/
notes-merge.c
diff --git
a/notes-merge.c
b/notes-merge.c
index 7eb9d7a0103ad8447e4fde50976a5669a75d8cdd..109ff4ef410b77a814cca282f728f1b88948e4ec 100644
(file)
--- a/
notes-merge.c
+++ b/
notes-merge.c
@@
-594,7
+594,7
@@
int notes_merge(struct notes_merge_options *o,
assert(local && remote);
/* Find merge bases */
- bases = get_merge_bases(local, remote
, 1
);
+ bases = get_merge_bases(local, remote);
if (!bases) {
base_sha1 = null_sha1;
base_tree_sha1 = EMPTY_TREE_SHA1_BIN;