===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff3/diff3.1,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/diff3/diff3.1	2005/12/27 12:48:56	1.5
--- src/usr.bin/diff3/diff3.1	2006/02/22 22:35:11	1.6
***************
*** 1,4 ****
! .\" $OpenBSD: diff3.1,v 1.5 2005/12/27 12:48:56 jmc Exp $
  .\"
  .\" Copyright (c) 1990, 1993, 1994
  .\"	The Regents of the University of California.  All rights reserved.
--- 1,4 ----
! .\" $OpenBSD: diff3.1,v 1.6 2006/02/22 22:35:11 jmc Exp $
  .\"
  .\" Copyright (c) 1990, 1993, 1994
  .\"	The Regents of the University of California.  All rights reserved.
***************
*** 37,43 ****
  .Nd 3-way differential file comparison
  .Sh SYNOPSIS
  .Nm diff3
! .Op Fl aexEX3
  .Ar file1 file2 file3
  .Sh DESCRIPTION
  The
--- 37,43 ----
  .Nd 3-way differential file comparison
  .Sh SYNOPSIS
  .Nm diff3
! .Op Fl 3aEeXx
  .Ar file1 file2 file3
  .Sh DESCRIPTION
  The
***************
*** 59,66 ****
--- 59,81 ----
  .Pp
  The options are as follows:
  .Bl -tag -width "-E, -X"
+ .It Fl 3
+ Produces an output script suitable for
+ .Xr ed 1
+ with changes
+ specific only to
+ .Ar file3 .
  .It Fl a
  Treat all files as ASCII.
+ .It Fl E , X
+ Similar to
+ .Fl e
+ and
+ .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,
+ bracketed by "<<<<<<" and ">>>>>>" lines.
  .It Fl e
  Produces output in a form suitable as an input script for the
  .Xr ed 1
***************
*** 88,108 ****
  .Xr ed 1
  with changes
  specific only to all three versions.
- .It Fl 3
- Produces an output script suitable for
- .Xr ed 1
- with changes
- specific only to
- .Ar file3 .
- .It Fl E , X
- Similar to
- .Fl e
- and
- .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,
- bracketed by "<<<<<<" and ">>>>>>" lines.
  .El
  .Pp
  The
--- 103,108 ----