Merge branch 'jk/t1006-cat-file-objectsize-disk' into maint-2.43

[thirdparty/git.git] / t / t1006-cat-file.sh

diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index 5ea33261289486def635bbbf75c683358357e3ad..e0c6482797e1203a9e97ec27714d5ea48aaf1b6c 100755 (executable)
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -6,7 +6,7 @@ test_description='git cat-file'
 
 test_cmdmode_usage () {
        test_expect_code 129 "$@" 2>err &&
-       grep "^error:.*is incompatible with" err
+       grep "^error: .* cannot be used together" err
 }
 
 for switches in \