Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
branch: give better message when no names specified for rename
[gitweb.git]
/
t
/
t7512-status-help.sh
diff --git
a/t/t7512-status-help.sh
b/t/t7512-status-help.sh
index d2da89a5f572134c55c690b1439ffde66ecdd6cb..9d4610629d725c22b9de5187abf71b2b8544292d 100755
(executable)
--- a/
t/t7512-status-help.sh
+++ b/
t/t7512-status-help.sh
@@
-14,6
+14,7
@@
test_description='git status advice'
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 &&