diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:00:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:00:28 -0700 |
| commit | d59c12d7ad39f942fc60578ba1e934822f40445b (patch) | |
| tree | f0591d6490164e7a8a672c79094a2d612899cfb7 /t/t1001-read-tree-m-2way.sh | |
| parent | Merge branch 'mh/update-ref-batch-create-fix' (diff) | |
| parent | code and test: fix misuses of "nor" (diff) | |
| download | tgif-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.xz | |
Merge branch 'jl/nor-or-nand-and'
Eradicate mistaken use of "nor" (that is, essentially "nor" used
not in "neither A nor B" ;-)) from in-code comments, command output
strings, and documentations.
* jl/nor-or-nand-and:
code and test: fix misuses of "nor"
comments: fix misuses of "nor"
contrib: fix misuses of "nor"
Documentation: fix misuses of "nor"
Diffstat (limited to 't/t1001-read-tree-m-2way.sh')
| -rwxr-xr-x | t/t1001-read-tree-m-2way.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index acaab07fac..3a24abf549 100755 --- a/t/t1001-read-tree-m-2way.sh +++ b/t/t1001-read-tree-m-2way.sh @@ -18,7 +18,7 @@ In the test, these paths are used: frotz - not in H added in M nitfol - in H, stays in M unmodified rezrov - in H, deleted in M - yomin - not in H nor M + yomin - not in H or M ' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-read-tree.sh |