summaryrefslogtreecommitdiff
path: root/src/merge.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/merge.c')
-rw-r--r--src/merge.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/merge.c b/src/merge.c
index 047d96013..82d2e6f37 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -24,6 +24,8 @@
#include "blob.h"
#include "hashsig.h"
#include "oid.h"
+#include "index.h"
+#include "filebuf.h"
#include "git2/types.h"
#include "git2/repository.h"