=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sdiff/sdiff.1,v retrieving revision 1.10 retrieving revision 1.11 diff -c -r1.10 -r1.11 *** src/usr.bin/sdiff/sdiff.1 2006/12/20 15:32:10 1.10 --- src/usr.bin/sdiff/sdiff.1 2007/02/22 02:50:56 1.11 *************** *** 1,9 **** ! .\" $OpenBSD: sdiff.1,v 1.10 2006/12/20 15:32:10 jasper Exp $ .\" .\" Written by Raymond Lai . .\" Public domain. .\" ! .Dd October 29, 2005 .Dt SDIFF 1 .Os .Sh NAME --- 1,9 ---- ! .\" $OpenBSD: sdiff.1,v 1.11 2007/02/22 02:50:56 ray Exp $ .\" .\" Written by Raymond Lai . .\" Public domain. .\" ! .Dd February 21, 2007 .Dt SDIFF 1 .Os .Sh NAME *************** *** 18,24 **** .Ar file1 .Ar file2 .Sh DESCRIPTION ! Shows a side-by-side comparison of two files. .Pp The options are: .Bl -tag -width Ds --- 18,39 ---- .Ar file1 .Ar file2 .Sh DESCRIPTION ! .Nm ! displays two files side by side, ! with any differences between the two highlighted as follows: ! new lines are marked with ! .Sq \*(Gt ; ! deleted lines are marked with ! .Sq \*(Lt ; ! and changed lines are marked with ! .Sq \*(Ba . ! .Pp ! .Nm ! can also be used to interactively merge two files, ! prompting at each set of differences. ! See the ! .Fl o ! option for an explanation. .Pp The options are: .Bl -tag -width Ds