===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff3/diff3.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src/usr.bin/diff3/diff3.1	2003/07/14 17:43:52	1.2
+++ src/usr.bin/diff3/diff3.1	2003/10/24 08:01:52	1.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: diff3.1,v 1.2 2003/07/14 17:43:52 deraadt Exp $
+.\" $OpenBSD: diff3.1,v 1.3 2003/10/24 08:01:52 jmc Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -53,7 +53,7 @@
 the separate versions into a new file.
 .Nm
 is used by
-.Xr RCS 1
+.Xr rcs 1
 to merge specific versions or create
 new versions.
 .Pp
@@ -98,7 +98,7 @@
 Similar to
 .Fl e
 and
-.Fl x  ,
+.Fl x ,
 respectively, but treat overlapping changes (i.e., changes that would
 be noted with ==== in the normal listing) differently.
 The overlapping lines from both files will be inserted by the edit script,
@@ -109,7 +109,7 @@
 .Fl E
 option is used by
 .Tn RCS
-.Xr merge  1
+.Xr merge 1
 to ensure that overlapping changes in the merged files are preserved
 and brought to someone's attention.
 .Pp
@@ -124,8 +124,7 @@
 to
 .Ar file1
 results in the file:
-.Pp
-.Bd -literal -offset indent -compact
+.Bd -literal -offset indent
 lines 1-6
 of file1
 <<<<<<< file1
@@ -180,8 +179,13 @@
 .Sh SEE ALSO
 .Xr diff 1 ,
 .Xr ed 1 ,
-.Xr merge 1
+.Xr merge 1 ,
 .Xr rcs 1
+.Sh HISTORY
+A
+.Nm
+command appeared in
+.At v7 .
 .Sh BUGS
 The
 .Fl e
@@ -194,8 +198,3 @@
 is an
 .Xr ed 1
 editing command.
-.Sh HISTORY
-A
-.Nm
-command appeared in
-.At v7 .