builtin/merge.c: drop a parameter that is never used

diff --git a/revision.h b/revision.h
index e7f1d211bf0a203978a3024bcbae5c98f25c60cf..89132df2fa481ce6cdd142fa31f5b2cfd2f43219 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -5,6 +5,7 @@
 #include "grep.h"
 #include "notes.h"
 #include "commit.h"
+#include "diff.h"
 
 #define SEEN           (1u<<0)
 #define UNINTERESTING   (1u<<1)