diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-08-01 11:58:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-01 12:01:01 -0700 |
| commit | d50cb7569cfb6e04ba48900821618d28012f334e (patch) | |
| tree | 641264cefb155981b8861759cd39665ffcd04cd2 /t/t7601-merge-pull-config.sh | |
| parent | Merge branch 'ms/subtree-install-fix' (diff) | |
| parent | many small typofixes (diff) | |
| download | tgif-d50cb7569cfb6e04ba48900821618d28012f334e.tar.xz | |
Merge branch 'ob/typofixes'
* ob/typofixes:
many small typofixes
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 && |