Display a progress meter during merge-recursive.

diff --git a/merge-base.c b/merge-base.c
index 59f723f4047f831165b8d52ac13def398e663ac3..385f4ba386ada3e43f962d9051cf4b651320fcd3 100644 (file)
--- a/merge-base.c
+++ b/merge-base.c
@@ -1,8 +1,7 @@
-#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)
 {