Permalink
Browse files

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>
  • Loading branch information...
1 parent 4393c23 commit 8ec0dd66fa277615fe79ad10096d81edb263d6d1 Miklos Vajna committed with gitster Jul 12, 2008
Showing with 4 additions and 0 deletions.
  1. +4 −0 t/t6021-merge-criss-cross.sh
View
4 t/t6021-merge-criss-cross.sh
@@ -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

0 comments on commit 8ec0dd6

Please sign in to comment.