diff options
Diffstat (limited to 'third_party/git/t/t3504-cherry-pick-rerere.sh')
| -rwxr-xr-x | third_party/git/t/t3504-cherry-pick-rerere.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/third_party/git/t/t3504-cherry-pick-rerere.sh b/third_party/git/t/t3504-cherry-pick-rerere.sh index a267b2d144df..80a0d0870653 100755 --- a/third_party/git/t/t3504-cherry-pick-rerere.sh +++ b/third_party/git/t/t3504-cherry-pick-rerere.sh @@ -94,8 +94,10 @@ test_expect_success 'cherry-pick --rerere-autoupdate more than once' ' test_expect_success 'cherry-pick conflict without rerere' ' test_config rerere.enabled false && - test_must_fail git cherry-pick master && - test_must_fail test_cmp expect foo + test_must_fail git cherry-pick foo-master && + grep ===== foo && + grep foo-dev foo && + grep foo-master foo ' test_done |