t6021: add a new test for git-merge-resolve
authorMiklos Vajna <vmiklos@frugalware.org>
Sat, 12 Jul 2008 18:42:10 +0000 (20:42 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jul 2008 20:49:10 +0000 (13:49 -0700)
It should fail properly if there are multiple merge bases, but there
were no test for this till now.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6021-merge-criss-cross.sh

index 0ab14a6e81302db6a1239d68270ab909cb2fd216..331b9b07d4eedb07377de605ebb87691427b7bb4 100755 (executable)
@@ -89,4 +89,8 @@ EOF
 
 test_expect_success 'Criss-cross merge result' 'cmp file file-expect'
 
+test_expect_success 'Criss-cross merge fails (-s resolve)' \
+'git reset --hard A^ &&
+test_must_fail git merge -s resolve -m "final merge" B'
+
 test_done