summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/diff/diff3.1
diff options
context:
space:
mode:
authorross <ross@NetBSD.org>2002-02-08 01:21:55 +0000
committerross <ross@NetBSD.org>2002-02-08 01:21:55 +0000
commitdc5571b22e34d6497536a3952a5e127c7b626e0f (patch)
tree8b8dbffd9327b8c4f9d31f8a092c44c5d5c1acd7 /gnu/usr.bin/diff/diff3.1
parentba8a3573875a70e926c64606964659ee121ba6b9 (diff)
Generate <>& symbolically. I'm avoiding .../dist/... directories for now.
Diffstat (limited to 'gnu/usr.bin/diff/diff3.1')
-rw-r--r--gnu/usr.bin/diff/diff3.14
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/usr.bin/diff/diff3.1 b/gnu/usr.bin/diff/diff3.1
index b1903289be0..28ae533336a 100644
--- a/gnu/usr.bin/diff/diff3.1
+++ b/gnu/usr.bin/diff/diff3.1
@@ -59,11 +59,11 @@ With
an overlapping change looks like this:
.sp
.nf
-<<<<<<< \fImine\fP
+\*[Lt]\*[Lt]\*[Lt]\*[Lt]\*[Lt]\*[Lt]\*[Lt] \fImine\fP
lines from \fImine\fP
=======
lines from \fIyours\fP
->>>>>>> \fIyours\fP
+\*[Gt]\*[Gt]\*[Gt]\*[Gt]\*[Gt]\*[Gt]\*[Gt] \fIyours\fP
.fi
.TP
.B \-\-ed