aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
Diffstat (limited to 'builtin/merge-recursive.c')
-rw-r--r--builtin/merge-recursive.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index 5a52f3d0a..70e1d258f 100644
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -2,6 +2,7 @@
#include "commit.h"
#include "tag.h"
#include "merge-recursive.h"
+#include "xdiff-interface.h"
static const char *better_branch_name(const char *branch)
{