Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/sdiff Improve description, based on OpenBSD v1.11.



details:   https://anonhg.NetBSD.org/src/rev/d9e719278765
branches:  trunk
changeset: 764516:d9e719278765
user:      wiz <wiz%NetBSD.org@localhost>
date:      Mon Apr 25 22:42:11 2011 +0000

description:
Improve description, based on OpenBSD v1.11.

diffstat:

 usr.bin/sdiff/sdiff.1 |  22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r a69203975a83 -r d9e719278765 usr.bin/sdiff/sdiff.1
--- a/usr.bin/sdiff/sdiff.1     Mon Apr 25 22:38:34 2011 +0000
+++ b/usr.bin/sdiff/sdiff.1     Mon Apr 25 22:42:11 2011 +0000
@@ -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 <ray%cyth.net@localhost>.
 .\" 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



Home | Main Index | Thread Index | Old Index