diff options
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
-rwxr-xr-x | t/t6021-merge-criss-cross.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh index 262381379f..331b9b07d4 100755 --- a/t/t6021-merge-criss-cross.sh +++ b/t/t6021-merge-criss-cross.sh @@ -4,18 +4,12 @@ # # See http://marc.theaimsgroup.com/?l=git&m=111463358500362&w=2 for a -# nice decription of what this is about. +# nice description of what this is about. test_description='Test criss-cross merge' . ./test-lib.sh -if test "$no_python"; then - echo "Skipping: no python => no recursive merge" - test_done - exit 0 -fi - test_expect_success 'prepare repository' \ 'echo "1 2 @@ -26,7 +20,7 @@ test_expect_success 'prepare repository' \ 7 8 9" > file && -git add file && +git add file && git commit -m "Initial commit" file && git branch A && git branch B && @@ -95,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 |