Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
sha1-file.c: mark more strings for translation
[gitweb.git]
/
t
/
t3200-branch.sh
diff --git
a/t/t3200-branch.sh
b/t/t3200-branch.sh
index 69ea8202f437a47b1c52b60f4a2afacd3d5a4f21..08467982f61fd81f0614711b52b9806f2497f3eb 100755
(executable)
--- a/
t/t3200-branch.sh
+++ b/
t/t3200-branch.sh
@@
-885,7
+885,7
@@
test_expect_success 'test --unset-upstream on a particular branch' '
test_must_fail git config branch.my14.merge
'
-test_expect_success '--set-upstream fails' '
+test_expect_success '
disabled option
--set-upstream fails' '
test_must_fail git branch --set-upstream origin/master
'