Merge branch 'jt/delay-fetch-if-missing'

[thirdparty/git.git] / builtin / merge-recursive.c
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c

index 5b910e351e4dede4527d23a04a8294e17ebd371c..a4bfd8fc51d6b26edda7a1c8afca4946f6ff485d 100644 (file)
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -1,3 +1,4 @@
+#include "cache.h"
  #include "builtin.h"
  #include "commit.h"
  #include "tag.h"
@@ -63,6 +64,9 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
         if (argc - i != 3) /* "--" "<head>" "<remote>" */
                 die(_("not handling anything other than two heads merge."));
  
+       if (repo_read_index_unmerged(the_repository))
+               die_resolve_conflict("merge");
+
         o.branch1 = argv[++i];
         o.branch2 = argv[++i];