Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
gitweb: Cleanup and uniquify error messages
[gitweb.git]
/
merge-base.c
diff --git
a/merge-base.c
b/merge-base.c
index b41f76cb72d02ba77ec04693ec1023d5707571a1..59f723f4047f831165b8d52ac13def398e663ac3 100644
(file)
--- a/
merge-base.c
+++ b/
merge-base.c
@@
-6,7
+6,7
@@
static int show_all = 0;
static int merge_base(struct commit *rev1, struct commit *rev2)
{
- struct commit_list *result = get_merge_bases(rev1, rev2);
+ struct commit_list *result = get_merge_bases(rev1, rev2
, 0
);
if (!result)
return 1;