diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-06-21 21:15:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-21 21:15:27 -0700 |
| commit | d836118be990867be3a4d3ce932f58d761e5e612 (patch) | |
| tree | 5d8d0f02e79fec24bf034d1660c81f70e4423512 /builtin-merge.c | |
| parent | Merge branch 'mn/maint-iconv-autoconf' into maint (diff) | |
| parent | refuse to merge during a merge (diff) | |
| download | tgif-d836118be990867be3a4d3ce932f58d761e5e612.tar.xz | |
Merge branch 'cb/maint-no-double-merge' into maint
* 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 0b58e5eda1..9e9bd526c3 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 |