summaryrefslogtreecommitdiff
path: root/t/t7601-merge-pull-config.sh
diff options
context:
space:
mode:
authorOndřej Bílka <neleai@seznam.cz>2013-07-29 08:18:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-29 19:32:25 (GMT)
commit98e023dea40a0eca8a61c037dfc59aaf27f003a4 (patch)
treec36b17d6bc32ffdc55625c64ee61160f48ec5b5e /t/t7601-merge-pull-config.sh
parent749f763dbbe4dbcc4082f02bf98bfc1a09427c6f (diff)
downloadgit-98e023dea40a0eca8a61c037dfc59aaf27f003a4.zip
git-98e023dea40a0eca8a61c037dfc59aaf27f003a4.tar.gz
git-98e023dea40a0eca8a61c037dfc59aaf27f003a4.tar.bz2
many small typofixes
Signed-off-by: Ondřej Bílka <neleai@seznam.cz> Reviewed-by: Marc Branchaud <marcnarc@xiplink.com> 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 25dac79..830a4c3 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 chosen.
+# recursive is chosen.
test_expect_success 'merge picks up the best result' '
git config --unset-all pull.twohead &&