Merge branch 'ks/rfc2047-one-char-at-a-time'

diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index 51ab89411f06aa200c27815b8642cb0c78caeba4..9d4610629d725c22b9de5187abf71b2b8544292d 100755 (executable)
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -5,7 +5,7 @@
 #                   Grenoble INP Ensimag
 #
 
-test_description='git status advices'
+test_description='git status advice'
 
 . ./test-lib.sh
 
@@ -14,6 +14,7 @@ test_description='git status advices'
 set_fake_editor
 
 test_expect_success 'prepare for conflicts' '
+       git config --global advice.statusuoption false &&
        test_commit init main.txt init &&
        git branch conflicts &&
        test_commit on_master main.txt on_master &&