Display a progress meter during merge-recursive.

diff --git a/merge-base.c b/merge-base.c
index 009caf804b43fdd644ff08991d55d0e417fd34d8..385f4ba386ada3e43f962d9051cf4b651320fcd3 100644 (file)
--- a/merge-base.c
+++ b/merge-base.c
@@ -1,4 +1,3 @@
-#include <stdlib.h>
 #include "cache.h"
 #include "commit.h"