summaryrefslogtreecommitdiff
path: root/patch.man
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2009-04-03 11:18:47 +0200
committerAndreas Gruenbacher <agruen@suse.de>2009-04-03 11:18:47 +0200
commita3b6c4bbe67fac2966af0228c94713937f2d8184 (patch)
treed17f316ecd332910224d6e8e3111650210df99fd /patch.man
parent863fbb04590b6936cb7aabce292321dd74a46d3b (diff)
downloadpatch-a3b6c4bbe67fac2966af0228c94713937f2d8184.tar.gz
Update the NEWS file
Diffstat (limited to 'patch.man')
-rw-r--r--patch.man8
1 files changed, 4 insertions, 4 deletions
diff --git a/patch.man b/patch.man
index 20a2f31..fc95e2b 100644
--- a/patch.man
+++ b/patch.man
@@ -411,10 +411,10 @@ Normal characters must still match exactly.
Each line of the context must still match a line in the original file.
.TP
\fB\-m\fP or \fB\*=merge\fP
-Merge a \fIpatchfile\fP into the original files similar to
-\fBmerge\fP(1). If a conflict is found, \fBpatch\fP outputs a warning
-and brackets the conflict with \fB<<<<<<<\fP and \fB>>>>>>>\fP lines. A
-typical conflict will look like this:
+Merge a patch file into the original files similar to \fBmerge\fP(1). If a
+conflict is found, \fBpatch\fP outputs a warning and brackets the conflict
+with \fB<<<<<<<\fP and \fB>>>>>>>\fP lines. A typical conflict will look like
+this:
.LP
.RS
.nf