diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2009-04-03 11:18:47 +0200 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2009-04-03 11:18:47 +0200 |
commit | a3b6c4bbe67fac2966af0228c94713937f2d8184 (patch) | |
tree | d17f316ecd332910224d6e8e3111650210df99fd /patch.man | |
parent | 863fbb04590b6936cb7aabce292321dd74a46d3b (diff) | |
download | patch-a3b6c4bbe67fac2966af0228c94713937f2d8184.tar.gz |
Update the NEWS file
Diffstat (limited to 'patch.man')
-rw-r--r-- | patch.man | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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 |