Merge branch 'ng/mergetool-lose-final-prompt'

diff --git a/packfile.h b/packfile.h
index cc7eaffe1baef8accc1476c92145b7c4bcdcf046..fa36c473adaf02df7395329587baf07e47febb34 100644 (file)
--- a/packfile.h
+++ b/packfile.h
@@ -1,12 +1,12 @@
 #ifndef PACKFILE_H
 #define PACKFILE_H
 
+#include "cache.h"
 #include "oidset.h"
 
 /* in object-store.h */
 struct packed_git;
 struct object_info;
-enum object_type;
 
 /*
  * Generate the filename to be used for a pack file with checksum "sha1" and