aboutsummaryrefslogtreecommitdiffstats
path: root/merge.c
diff options
context:
space:
mode:
Diffstat (limited to 'merge.c')
-rw-r--r--merge.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/merge.c b/merge.c
index 10aaec3a6c..fade6b203b 100644
--- a/merge.c
+++ b/merge.c
@@ -4,6 +4,7 @@
#include "gettext.h"
#include "hex.h"
#include "lockfile.h"
+#include "merge.h"
#include "commit.h"
#include "run-command.h"
#include "resolve-undo.h"