Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lebar <jlebar@google.com>2014-04-01 02:11:47 +0400
committerJunio C Hamano <gitster@pobox.com>2014-04-01 02:29:33 +0400
commit235e8d591480d7e1378c27fe65c5529625d4b5be (patch)
treeecfd18463fa83687c6926852b373d8040d403234 /t/t4005-diff-rename-2.sh
parent01689909eb9f8366583c44b325d8d9ba259a2538 (diff)
code and test: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4005-diff-rename-2.sh')
-rwxr-xr-xt/t4005-diff-rename-2.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh
index 77d7f4946f..7d2c6e13a2 100755
--- a/t/t4005-diff-rename-2.sh
+++ b/t/t4005-diff-rename-2.sh
@@ -66,7 +66,7 @@ test_expect_success \
# tree has COPYING and rezrov. work tree has the same COPYING and
# copy-edited COPYING.1, and unchanged rezrov. We should not say
-# anything about rezrov nor COPYING, since the revised again diff-raw
+# anything about rezrov or COPYING, since the revised again diff-raw
# nows how to say Copy.
test_expect_success \