summaryrefslogtreecommitdiff
path: root/t/t7601-merge-pull-config.sh
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2013-04-11 22:36:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-04-12 20:38:40 (GMT)
commit41ccfdd9c931ee71b09f38f4eb19cf44a8e4381d (patch)
tree645135f6c34c03a1b409488bfa528536398228b5 /t/t7601-merge-pull-config.sh
parent2fec81cbe5a9867bac65bb0aa9e2605a9de68c4d (diff)
downloadgit-41ccfdd9c931ee71b09f38f4eb19cf44a8e4381d.zip
git-41ccfdd9c931ee71b09f38f4eb19cf44a8e4381d.tar.gz
git-41ccfdd9c931ee71b09f38f4eb19cf44a8e4381d.tar.bz2
Correct common spelling mistakes in comments and tests
Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7601-merge-pull-config.sh')
-rwxr-xr-xt/t7601-merge-pull-config.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index b44b293..25dac79 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -109,7 +109,7 @@ test_expect_success 'setup conflicted merge' '
'
# First do the merge with resolve and recursive then verify that
-# recusive is choosen.
+# recusive is chosen.
test_expect_success 'merge picks up the best result' '
git config --unset-all pull.twohead &&