diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 02:03:58 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-18 14:02:04 -0700 |
| commit | 6239af1c6c272eeb2b15359ff0dc25d769d5ac78 (patch) | |
| tree | c0594bd0c181a7091dadb6f281007afc0814f279 /git-stash.sh | |
| parent | merge script: tweak unmerged files message to match builtin (diff) | |
| download | tgif-6239af1c6c272eeb2b15359ff0dc25d769d5ac78.tar.xz | |
merge script: refuse to merge during merge
Check MERGE_HEAD and bail out if it exists. Based on v1.6.3.3~3^2
(refuse to merge during a merge, 2009-06-01). Without this change,
the scripted merge does not pass t3030.
Cc: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-stash.sh')
0 files changed, 0 insertions, 0 deletions