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 /test-chmtime.c | |
| 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 'test-chmtime.c')
| -rw-r--r-- | test-chmtime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test-chmtime.c b/test-chmtime.c index 0df748784b..dfe8a83261 100644 --- a/test-chmtime.c +++ b/test-chmtime.c @@ -1,6 +1,6 @@ /* * This program can either change modification time of the given - * file(s) or just print it. The program does not change atime nor + * file(s) or just print it. The program does not change atime or * ctime (their values are explicitly preserved). * * The mtime can be changed to an absolute value: |