Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'

diff --git a/builtin/apply.c b/builtin/apply.c
index 0189523798f31711ad74eaf3dd90ece9c12fa61a..87439fad118a2671989120dd5993a17b4541e2db 100644 (file)
--- 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 ;-).
         */