diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-08 21:00:27 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 21:00:28 +0200 |
| commit | d59c12d7ad39f942fc60578ba1e934822f40445b (patch) | |
| tree | f0591d6490164e7a8a672c79094a2d612899cfb7 /t/t7104-reset-hard.sh | |
| parent | Merge branch 'mh/update-ref-batch-create-fix' (diff) | |
| parent | code and test: fix misuses of "nor" (diff) | |
| download | git-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.xz git-d59c12d7ad39f942fc60578ba1e934822f40445b.zip | |
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/t7104-reset-hard.sh')
| -rwxr-xr-x | t/t7104-reset-hard.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7104-reset-hard.sh b/t/t7104-reset-hard.sh index f136ee7bb5..16faa07813 100755 --- a/t/t7104-reset-hard.sh +++ b/t/t7104-reset-hard.sh @@ -33,7 +33,7 @@ test_expect_success 'reset --hard should restore unmerged ones' ' ' -test_expect_success 'reset --hard did not corrupt index nor cached-tree' ' +test_expect_success 'reset --hard did not corrupt index or cached-tree' ' T=$(git write-tree) && rm -f .git/index && |