X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=merge-base.c;h=385f4ba386ada3e43f962d9051cf4b651320fcd3;hb=4ae89b76252d1c13a6675a2a4e491983946d72ec;hp=b41f76cb72d02ba77ec04693ec1023d5707571a1;hpb=7c6f8aaf6d795f0c9a75671acceb9754ea06fd81;p=git.git

diff --git a/merge-base.c b/merge-base.c
index b41f76cb7..385f4ba38 100644
--- a/merge-base.c
+++ b/merge-base.c
@@ -1,12 +1,11 @@
-#include <stdlib.h>
 #include "cache.h"
 #include "commit.h"
 
-static int show_all = 0;
+static int show_all;
 
 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;