Merge branch 'mh/fix-send-email-threaded'

[git.git] / builtin-merge.c

diff --git a/builtin-merge.c b/builtin-merge.c
index 8d101eff0b433bd5afa6cf1e027e50447fdf5370..793f2f4a189e448fb481c5c1e2886be28fddf2e2 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -836,8 +836,11 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
        struct commit_list **remotes = &remoteheads;
 
        setup_work_tree();
+       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.");
+               die("You are in the middle of a conflicted merge."
+                               " (index unmerged)");
 
        /*
         * Check if we are _not_ on a detached HEAD, i.e. if there is a