summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Lai <ray@cvs.openbsd.org>2007-02-22 02:50:57 +0000
committerRay Lai <ray@cvs.openbsd.org>2007-02-22 02:50:57 +0000
commit28be4aaf667d9ad44c93bdc68b15a111e28fe396 (patch)
tree736f22d6ba93ad4e96d17d5aa378a65500205205
parent58324e8bb6dd01a9cb34dd10dbe54089d6d07560 (diff)
Expand description.
Help and okay jmc@.
-rw-r--r--usr.bin/sdiff/sdiff.121
1 files changed, 18 insertions, 3 deletions
diff --git a/usr.bin/sdiff/sdiff.1 b/usr.bin/sdiff/sdiff.1
index 4075ee3a9de..a3c6664c232 100644
--- a/usr.bin/sdiff/sdiff.1
+++ b/usr.bin/sdiff/sdiff.1
@@ -1,9 +1,9 @@
-.\" $OpenBSD: sdiff.1,v 1.10 2006/12/20 15:32:10 jasper Exp $
+.\" $OpenBSD: sdiff.1,v 1.11 2007/02/22 02:50:56 ray Exp $
.\"
.\" Written by Raymond Lai <ray@cyth.net>.
.\" Public domain.
.\"
-.Dd October 29, 2005
+.Dd February 21, 2007
.Dt SDIFF 1
.Os
.Sh NAME
@@ -18,7 +18,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 \*(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