The seventh batch

[thirdparty/git.git] / t / t3507-cherry-pick-conflict.sh

diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index c88d597b12682ccc611699f43c6451e35483fe6a..f3947b400a3a89970e400d3c3f5dc5d690292d83 100755 (executable)
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -60,6 +60,7 @@ test_expect_success 'advice from failed cherry-pick' '
        hint: You can instead skip this commit with "git cherry-pick --skip".
        hint: To abort and get back to the state before "git cherry-pick",
        hint: run "git cherry-pick --abort".
+       hint: Disable this message with "git config advice.mergeConflict false"
        EOF
        test_must_fail git cherry-pick picked 2>actual &&
 
@@ -74,6 +75,7 @@ test_expect_success 'advice from failed cherry-pick --no-commit' "
        error: could not apply \$picked... picked
        hint: after resolving the conflicts, mark the corrected paths
        hint: with 'git add <paths>' or 'git rm <paths>'
+       hint: Disable this message with \"git config advice.mergeConflict false\"
        EOF
        test_must_fail git cherry-pick --no-commit picked 2>actual &&