aboutsummaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
Diffstat (limited to 'merge.c')
-rw-r--r--merge.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/merge.c b/merge.c
index 83bcba6943..b60925459c 100644
--- a/merge.c
+++ b/merge.c
@@ -2,10 +2,12 @@
#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"