Module Name: src
Committed By: wiz
Date: Mon Apr 25 22:42:11 UTC 2011
Modified Files:
src/usr.bin/sdiff: sdiff.1
Log Message:
Improve description, based on OpenBSD v1.11.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/sdiff/sdiff.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/sdiff/sdiff.1
diff -u src/usr.bin/sdiff/sdiff.1:1.1 src/usr.bin/sdiff/sdiff.1:1.2
--- src/usr.bin/sdiff/sdiff.1:1.1 Sun Feb 18 22:13:42 2007
+++ src/usr.bin/sdiff/sdiff.1 Mon Apr 25 22:42:11 2011
@@ -1,9 +1,10 @@
-.\" $NetBSD: sdiff.1,v 1.1 2007/02/18 22:13:42 rmind Exp $
+.\" $NetBSD: sdiff.1,v 1.2 2011/04/25 22:42:11 wiz Exp $
+.\" $OpenBSD: sdiff.1,v 1.11 2007/02/22 02:50:56 ray Exp $
.\"
.\" Written by Raymond Lai <r...@cyth.net>.
.\" Public domain.
.\"
-.Dd October 29, 2005
+.Dd February 21, 2007
.Dt SDIFF 1
.Os
.Sh NAME
@@ -18,7 +19,22 @@
.Ar file1
.Ar file2
.Sh DESCRIPTION
-Shows a side-by-side comparison of two files.
+.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 | .
+.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
