diff options
Diffstat (limited to 't/t4200-rerere.sh')
| -rwxr-xr-x | t/t4200-rerere.sh | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index 23f9c0ca45..afaf085e42 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -601,4 +601,41 @@ test_expect_success 'rerere with unexpected conflict markers does not crash' ' git rerere clear ' +test_expect_success 'rerere with inner conflict markers' ' + git reset --hard && + + git checkout -b A master && + echo "bar" >test && + git add test && + git commit -q -m two && + echo "baz" >test && + git add test && + git commit -q -m three && + + git reset --hard && + git checkout -b B master && + echo "foo" >test && + git add test && + git commit -q -a -m one && + + test_must_fail git merge A~ && + git add test && + git commit -q -m "will solve conflicts later" && + test_must_fail git merge A && + + echo "resolved" >test && + git add test && + git commit -q -m "solved conflict" && + + echo "resolved" >expect && + + git reset --hard HEAD~~ && + test_must_fail git merge A~ && + git add test && + git commit -q -m "will solve conflicts later" && + test_must_fail git merge A && + cat test >actual && + test_cmp expect actual +' + test_done |