Merge branch 'mm/conflict-advice'

[git.git] / builtin-merge.c

diff --git a/builtin-merge.c b/builtin-merge.c
index 82e2a0491a0f3f148ff65851d44481d2809f64de..6f1311414b6ba6c956cdc75a4afc0ed361a0f92d 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -849,11 +849,20 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
        const char *best_strategy = NULL, *wt_strategy = NULL;
        struct commit_list **remotes = &remoteheads;
 
-       if (file_exists(git_path("MERGE_HEAD")))
-               die("You have not concluded your merge. (MERGE_HEAD exists)");
-       if (read_cache_unmerged())
-               die("You are in the middle of a conflicted merge."
-                               " (index unmerged)");
+       if (read_cache_unmerged()) {
+               die_resolve_conflict("merge");
+       }
+       if (file_exists(git_path("MERGE_HEAD"))) {
+               /*
+                * There is no unmerged entry, don't advise 'git
+                * add/rm <file>', just 'git commit'.
+                */
+               if (advice_resolve_conflict)
+                       die("You have not concluded your merge (MERGE_HEAD exists).\n"
+                           "Please, commit your changes before you can merge.");
+               else
+                       die("You have not concluded your merge (MERGE_HEAD exists).");
+       }
 
        /*
         * Check if we are _not_ on a detached HEAD, i.e. if there is a