===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff3/diff3.1,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/diff3/diff3.1	2003/10/24 08:01:52	1.3
--- src/usr.bin/diff3/diff3.1	2004/07/07 14:28:23	1.4
***************
*** 1,4 ****
! .\" $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.
--- 1,4 ----
! .\" $OpenBSD: diff3.1,v 1.4 2004/07/07 14:28:23 jaredy Exp $
  .\"
  .\" Copyright (c) 1990, 1993, 1994
  .\"	The Regents of the University of California.  All rights reserved.
***************
*** 119,125 ****
  .Ar file2 .
  Applying the edit script generated by the command
  .Pp
! .Dl diff3 -E file1 file2 file3
  .Pp
  to
  .Ar file1
--- 119,125 ----
  .Ar file2 .
  Applying the edit script generated by the command
  .Pp
! .Dl $ diff3 -E file1 file2 file3
  .Pp
  to
  .Ar file1
***************
*** 173,179 ****
  temporary file
  .It Pa /tmp/d3b.XXXXXXXXXX
  temporary file
! .It Pa /usr/libexec/diff3
  the actual executable
  .El
  .Sh SEE ALSO
--- 173,179 ----
  temporary file
  .It Pa /tmp/d3b.XXXXXXXXXX
  temporary file
! .It Pa /usr/libexec/diff3prog
  the actual executable
  .El
  .Sh SEE ALSO