t6021: add a new test for git-merge-resolve

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>
17 years ago · 8ec0dd66fa
1 changed files with 4 additions and 0 deletions
--- a/t/t6021-merge-criss-cross.sh
+++ b/t/t6021-merge-criss-cross.sh
@ -89,4 +89,8 @@ EOF
				@@ -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