diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-13 23:50:22 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-13 23:50:22 +0400 |
| commit | 0a17b2cd7ebc0beeab6121d96ce812f22994cc39 (patch) | |
| tree | 85dd8e39916a822c2ce5ee98e284a19a9a632297 /builtin-merge.c | |
| parent | 7d40f89137b456820d51ebc1cbb3ffbb966e7fec (diff) | |
| parent | c8c562a238071843c64ea0f3a2c85481606da379 (diff) | |
Merge branch 'cb/maint-no-double-merge'
* cb/maint-no-double-merge:
refuse to merge during a merge
Diffstat (limited to 'builtin-merge.c')
| -rw-r--r-- | builtin-merge.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index 8d101eff0b..793f2f4a18 100644 --- 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 |