summaryrefslogtreecommitdiff
path: root/t/t4253-am-keep-cr-dos.sh
diff options
context:
space:
mode:
authorLeila Muhtasib <muhtasib@gmail.com>2012-06-22 20:03:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-06-22 21:25:04 (GMT)
commit8d8136c37a98bfb545f46990e3854df3414c3528 (patch)
tree5d0542bc1ed9894ce850d47c28c0a0a3ca679038 /t/t4253-am-keep-cr-dos.sh
parent0e64a95ae5824238cebdc921ed060efdef19620d (diff)
downloadgit-8d8136c37a98bfb545f46990e3854df3414c3528.zip
git-8d8136c37a98bfb545f46990e3854df3414c3528.tar.gz
git-8d8136c37a98bfb545f46990e3854df3414c3528.tar.bz2
Documentation: Fix misspellings
Signed-off-by: Leila Muhtasib <muhtasib@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4253-am-keep-cr-dos.sh')
-rwxr-xr-xt/t4253-am-keep-cr-dos.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4253-am-keep-cr-dos.sh b/t/t4253-am-keep-cr-dos.sh
index 735e55d..553fe3e 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 &&