diff options
| author | Ondřej Bílka <neleai@seznam.cz> | 2013-07-29 10:18:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-29 12:32:25 -0700 |
| commit | 98e023dea40a0eca8a61c037dfc59aaf27f003a4 (patch) | |
| tree | c36b17d6bc32ffdc55625c64ee61160f48ec5b5e /t/t7601-merge-pull-config.sh | |
| parent | 749f763dbbe4dbcc4082f02bf98bfc1a09427c6f (diff) | |
| download | git-98e023dea40a0eca8a61c037dfc59aaf27f003a4.tar.gz | |
many small typofixesob/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-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 25dac79889..830a4c3e9d 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 && |