git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 64048d6)
merge script: refuse to merge during merge
authorJonathan Nieder <redacted>
Tue, 17 Aug 2010 07:03:58 +0000 (02:03 -0500)
committerJunio C Hamano <redacted>
Wed, 18 Aug 2010 21:02:04 +0000 (14:02 -0700)
commit6239af1c6c272eeb2b15359ff0dc25d769d5ac78
treec0594bd0c181a7091dadb6f281007afc0814f279tree | snapshot
parent64048d670b4810125493ff0a2bab88cb12344e7fcommit | diff
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 <redacted>
Signed-off-by: Jonathan Nieder <redacted>
Signed-off-by: Junio C Hamano <redacted>
contrib/examples/git-merge.sh diff | blob | history
git clone https://git.99rst.org/PROJECT