diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-06-22 14:35:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-22 14:35:57 -0700 |
| commit | f71be5cc062e23c481944ba3f7e6d25fdcf58f28 (patch) | |
| tree | 50a72ab2c11c9fe476f9c4de79d4c782714d21a4 /t | |
| parent | Merge branch 'vr/help-per-platform' (diff) | |
| parent | Documentation: Fix misspellings (diff) | |
| download | tgif-f71be5cc062e23c481944ba3f7e6d25fdcf58f28.tar.xz | |
Merge branch 'maint'
* maint:
Documentation: Fix misspellings
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4253-am-keep-cr-dos.sh | 4 | ||||
| -rwxr-xr-x | t/t9300-fast-import.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t4253-am-keep-cr-dos.sh b/t/t4253-am-keep-cr-dos.sh index 735e55d77c..553fe3e88e 100755 --- a/t/t4253-am-keep-cr-dos.sh +++ b/t/t4253-am-keep-cr-dos.sh @@ -62,7 +62,7 @@ test_expect_success 'am with dos files config am.keepcr' ' git diff --exit-code master ' -test_expect_success 'am with dos files config am.keepcr overriden by --no-keep-cr' ' +test_expect_success 'am with dos files config am.keepcr overridden by --no-keep-cr' ' git config am.keepcr 1 && git checkout -b dosfiles-conf-keepcr-override initial && git format-patch -k initial..master && @@ -83,7 +83,7 @@ test_expect_success 'am with dos files with --keep-cr continue' ' git diff --exit-code master ' -test_expect_success 'am with unix files config am.keepcr overriden by --no-keep-cr' ' +test_expect_success 'am with unix files config am.keepcr overridden by --no-keep-cr' ' git config am.keepcr 1 && git checkout -b unixfiles-conf-keepcr-override initial && cp -f file1 file && diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 2aa1824a94..c17f52e586 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -2117,7 +2117,7 @@ test_expect_success \ grep :1 git.marks' test_expect_success \ - 'R: export-marks options can be overriden by commandline options' \ + 'R: export-marks options can be overridden by commandline options' \ 'cat input | git fast-import --export-marks=other.marks && grep :1 other.marks' |