pack: move has_sha1_pack()

diff --git a/builtin/merge.c b/builtin/merge.c
index 328945d6093aae40410b0c437a21c588ac6d6692..dfd6830602e62ec2cc0439b8e140bda6eae6e9fb 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -32,6 +32,7 @@
 #include "gpg-interface.h"
 #include "sequencer.h"
 #include "string-list.h"
+#include "packfile.h"
 
 #define DEFAULT_TWOHEAD (1<<0)
 #define DEFAULT_OCTOPUS (1<<1)