diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-04-12 00:36:10 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-12 13:38:40 -0700 |
| commit | 41ccfdd9c931ee71b09f38f4eb19cf44a8e4381d (patch) | |
| tree | 645135f6c34c03a1b409488bfa528536398228b5 /t/t7601-merge-pull-config.sh | |
| parent | 2fec81cbe5a9867bac65bb0aa9e2605a9de68c4d (diff) | |
| download | git-41ccfdd9c931ee71b09f38f4eb19cf44a8e4381d.tar.gz | |
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-x | t/t7601-merge-pull-config.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh index b44b293950..25dac79889 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 && |