Merge branch 'jt/packmigrate'

diff --git a/builtin/merge.c b/builtin/merge.c
index cc570529932344d3c3477281576ab5642818e3aa..7b7320dede66d4392107eba7ff78baa8a47de65e 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)