merge-recursive --patience

[git.git] / builtin / merge-recursive.c

diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index 5a52f3d0a23d12ed64fd49134cf94c8b0045eeb2..70e1d258fb49ad917674f62cd1864d3a1517752a 100644 (file)
--- 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)
 {