summaryrefslogtreecommitdiff
path: root/t/t3200-branch.sh
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-08-30 23:31:49 -0500
committerJunio C Hamano <gitster@pobox.com>2013-09-03 12:14:28 -0700
commit002ba0376b0836ff36f3ba1d079258ca94e66aca (patch)
treeb35821d380ef2830fee1a4f2bea3305a5389159e /t/t3200-branch.sh
parent140cd84593d8aa794ef9c31b4128cb295cbb04e2 (diff)
downloadgit-002ba0376b0836ff36f3ba1d079258ca94e66aca.tar.gz
t: branch: fix typo
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3200-branch.sh')
-rwxr-xr-xt/t3200-branch.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index ea548f9b98..3134652f8b 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -351,7 +351,7 @@ test_expect_success 'test overriding tracking setup via --no-track' '
test_expect_success 'no tracking without .fetch entries' '
git config branch.autosetupmerge true &&
git branch my6 s &&
- git config branch.automsetupmerge false &&
+ git config branch.autosetupmerge false &&
test -z "$(git config branch.my6.remote)" &&
test -z "$(git config branch.my6.merge)"
'