diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:03:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:03:26 -0700 |
| commit | 3c9e56b75c4a9a6832d94a00f079ea68e8a281ca (patch) | |
| tree | 5f5b11703f64319bcb71603c825d382f4703a763 /builtin/apply.c | |
| parent | Merge branch 'cn/fetch-prune-overlapping-destination' into maint (diff) | |
| parent | code and test: fix misuses of "nor" (diff) | |
| download | tgif-3c9e56b75c4a9a6832d94a00f079ea68e8a281ca.tar.xz | |
Merge branch 'jl/nor-or-nand-and' into maint
* 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 'builtin/apply.c')
| -rw-r--r-- | builtin/apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index b0d0986226..6013e1913c 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch) return error(_("cannot open %s: %s"), namebuf, strerror(errno)); /* Normal git tools never deal with .rej, so do not pretend - * this is a git patch by saying --git nor give extended + * this is a git patch by saying --git or giving extended * headers. While at it, maybe please "kompare" that wants * the trailing TAB and some garbage at the end of line ;-). */ |