summaryrefslogtreecommitdiff
path: root/t/t3504-cherry-pick-rerere.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t3504-cherry-pick-rerere.sh')
-rwxr-xr-xt/t3504-cherry-pick-rerere.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t3504-cherry-pick-rerere.sh b/t/t3504-cherry-pick-rerere.sh
index a267b2d144..80a0d08706 100755
--- a/t/t3504-cherry-pick-rerere.sh
+++ b/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