Merge git-gui into ml/git-gui-exec-path-fix

[thirdparty/git.git] / merge.c

diff --git a/merge.c b/merge.c
index 10aaec3a6c1afca8fef4e3aac3dcd0d1cd2b9f63..b60925459c292bbb4a9daae46534edfbb3eca756 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -1,10 +1,13 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "diff.h"
 #include "diffcore.h"
 #include "gettext.h"
+#include "hash.h"
 #include "hex.h"
 #include "lockfile.h"
+#include "merge.h"
 #include "commit.h"
+#include "repository.h"
 #include "run-command.h"
 #include "resolve-undo.h"
 #include "tree.h"