Allow the user to control the verbosity of merge-recursive.

diff --git a/merge-base.c b/merge-base.c
index b41f76cb72d02ba77ec04693ec1023d5707571a1..385f4ba386ada3e43f962d9051cf4b651320fcd3 100644 (file)
--- 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;