=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff3/diff3.1,v retrieving revision 1.1 retrieving revision 1.2 diff -c -r1.1 -r1.2 *** src/usr.bin/diff3/diff3.1 2003/07/10 16:06:07 1.1 --- src/usr.bin/diff3/diff3.1 2003/07/14 17:43:52 1.2 *************** *** 1,4 **** ! .\" $OpenBSD: diff3.1,v 1.1 2003/07/10 16:06:07 millert Exp $ .\" .\" Copyright (c) 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. --- 1,4 ---- ! .\" $OpenBSD: diff3.1,v 1.2 2003/07/14 17:43:52 deraadt Exp $ .\" .\" Copyright (c) 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. *************** *** 143,149 **** makes notation of the differences between all files, and those differences specific to each pair of files. The changes are described by the commands necessary for ! .Xr ed 1 to create the desired target from the different versions. See .Xr diff 1 --- 143,149 ---- makes notation of the differences between all files, and those differences specific to each pair of files. The changes are described by the commands necessary for ! .Xr ed 1 to create the desired target from the different versions. See .Xr diff 1