summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/diff3
diff options
context:
space:
mode:
authorNate Williams <nate@FreeBSD.org>1995-02-20 18:47:18 +0000
committerNate Williams <nate@FreeBSD.org>1995-02-20 18:47:18 +0000
commitf8972f58e80f6a373cb71f90113e71f34100def9 (patch)
tree51360a61ea63ec3ea1690350c779bb28ec6197af /gnu/usr.bin/diff3
parent56b688ea1c96f6ee19e1475aa6c1340c73240f31 (diff)
Notes
Diffstat (limited to 'gnu/usr.bin/diff3')
-rw-r--r--gnu/usr.bin/diff3/diff3.13
1 files changed, 3 insertions, 0 deletions
diff --git a/gnu/usr.bin/diff3/diff3.1 b/gnu/usr.bin/diff3/diff3.1
index b1903289be09..9873b0887d87 100644
--- a/gnu/usr.bin/diff3/diff3.1
+++ b/gnu/usr.bin/diff3/diff3.1
@@ -39,6 +39,9 @@ into
.IR mine ,
surrounding all conflicts with bracket lines.
.TP
+.B \-B
+Old behavior of -A. Shows non-conflicts.
+.TP
.B \-e
Generate an
.I ed