Merge branch 'rs/blame-typefix-for-fingerprint'

[thirdparty/git.git] / t / t3504-cherry-pick-rerere.sh

diff --git a/t/t3504-cherry-pick-rerere.sh b/t/t3504-cherry-pick-rerere.sh
index a267b2d144df4a84f18ba4907b317e757ba98f16..80a0d087065398732a8ca74bb87c4509b3c8b0b1 100755 (executable)
--- 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