X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6021-merge-criss-cross.sh;h=331b9b07d4eedb07377de605ebb87691427b7bb4;hb=d68565402a69fac3fe0e0653718feca7c80c178b;hp=0ab14a6e81302db6a1239d68270ab909cb2fd216;hpb=c7ea453618e41e05a06f05e3ab63d555d0ddd7d9;p=git.git

diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh
index 0ab14a6e8..331b9b07d 100755
--- a/t/t6021-merge-criss-cross.sh
+++ b/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