diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-04-11 22:36:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-12 20:38:40 (GMT) |
| commit | 41ccfdd9c931ee71b09f38f4eb19cf44a8e4381d (patch) | |
| tree | 645135f6c34c03a1b409488bfa528536398228b5 /t/t7610-mergetool.sh | |
| parent | 2fec81cbe5a9867bac65bb0aa9e2605a9de68c4d (diff) | |
| download | git-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/t7610-mergetool.sh')
| -rwxr-xr-x | t/t7610-mergetool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index bc38737..d526b1d 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -237,7 +237,7 @@ test_expect_success 'mergetool takes partial path' ' git submodule update -N && test_must_fail git merge master && - #shouldnt need these lines + #should not need these lines #( yes "d" | git mergetool file11 >/dev/null 2>&1 ) && #( yes "d" | git mergetool file12 >/dev/null 2>&1 ) && #( yes "l" | git mergetool submod >/dev/null 2>&1 ) && |