Merge branch 'en/fetch-negotiation-default-fix'

[thirdparty/git.git] / t / t4209-log-pickaxe.sh

diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh
index 75795d0b492b4b3a32ab0539a1932bd9c38fcd6c..7f6bb27f141fe786811302f023366e6d15a5aa0e 100755 (executable)
--- a/t/t4209-log-pickaxe.sh
+++ b/t/t4209-log-pickaxe.sh
@@ -63,21 +63,21 @@ test_expect_success 'usage' '
        test_i18ngrep "switch.*requires a value" err &&
 
        test_expect_code 128 git log -Gregex -Sstring 2>err &&
-       grep "mutually exclusive" err &&
+       grep "cannot be used together" err &&
 
        test_expect_code 128 git log -Gregex --find-object=HEAD 2>err &&
-       grep "mutually exclusive" err &&
+       grep "cannot be used together" err &&
 
        test_expect_code 128 git log -Sstring --find-object=HEAD 2>err &&
-       grep "mutually exclusive" err &&
+       grep "cannot be used together" err &&
 
        test_expect_code 128 git log --pickaxe-all --find-object=HEAD 2>err &&
-       grep "mutually exclusive" err
+       grep "cannot be used together" err
 '
 
 test_expect_success 'usage: --pickaxe-regex' '
        test_expect_code 128 git log -Gregex --pickaxe-regex 2>err &&
-       grep "mutually exclusive" err
+       grep "cannot be used together" err
 '
 
 test_expect_success 'usage: --no-pickaxe-regex' '