merge-recursive: Avoid doubly merging rename/add conflict contents

diff --git a/git.c b/git.c
index ce4bcfec03bb4371d01b3f39bf93764eda337ce7..50a14013c5a87fed200df0a5a4ec6db0f1e2c223 100644 (file)
--- a/git.c
+++ b/git.c
@@ -1,6 +1,7 @@
 #include "builtin.h"
-#include "exec_cmd.h"
 #include "cache.h"
+#include "exec_cmd.h"
+#include "help.h"
 #include "quote.h"
 #include "run-command.h"