Date: Thu, 16 Aug 2012 04:13:16 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r240426 - soc2012/jhagewood/sdiff Message-ID: <20120816041316.E2249106566B@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhagewood Date: Thu Aug 16 04:13:16 2012 New Revision: 240426 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240426 Log: Completed zsdiff man pages Modified: soc2012/jhagewood/sdiff/zsdiff.1 Modified: soc2012/jhagewood/sdiff/zsdiff.1 ============================================================================== --- soc2012/jhagewood/sdiff/zsdiff.1 Thu Aug 16 03:52:01 2012 (r240425) +++ soc2012/jhagewood/sdiff/zsdiff.1 Thu Aug 16 04:13:16 2012 (r240426) @@ -4,12 +4,12 @@ .\" Written by Raymond Lai <ray@cyth.net>. .\" Public domain. .\" -.Dd $Mdocdate: July 5 2012 $ -.Dt SDIFF 1 +.Dd $Mdocdate: Aug 16 2012 $ +.Dt ZSDIFF 1 .Os .Sh NAME -.Nm sdiff -.Nd side-by-side diff +.Nm zsdiff +.Nd side-by-side diff of compressed files. .Sh SYNOPSIS .Nm .Op Fl abdilstW @@ -32,105 +32,9 @@ .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 -.It Fl l -left-column -Only print the left column for identical lines. -.It Fl o -output Ar outfile -Interactively merge -.Ar file1 -and -.Ar file2 -into -.Ar outfile . -In this mode, the user is prompted for each set of differences. -See -.Ev EDITOR -and -.Ev VISUAL , -below, -for details of which editor, if any, is invoked. -.Pp -The commands are as follows: -.Bl -tag -width Ds -.It Cm l | 1 -Choose left set of diffs. -.It Cm r | 2 -Choose right set of diffs. -.It Cm s -Silent mode \(en identical lines are not printed. -.It Cm v -Verbose mode \(en identical lines are printed. -.It Cm e -Start editing an empty file, which will be merged into -.Ar outfile -upon exiting the editor. -.It Cm e Cm l -Start editing file with left set of diffs. -.It Cm e Cm r -Start editing file with right set of diffs. -.It Cm e Cm b -Start editing file with both sets of diffs. -.It Cm q -Quit -.Nm . -.El -.It Fl s -suppress-common-lines -Skip identical lines. -.It Fl w -width Ar width -Print a maximum of -.Ar width -characters on each line. -The default is 130 characters. -.El +See sdiff(1) for options. .Pp -Options passed to -.Xr diff 1 -are: -.Bl -tag -width Ds -.It Fl a -text -Treat -.Ar file1 -and -.Ar file2 -as text files. -.It Fl b -ignore-space-change -Ignore trailing blank spaces. -.It Fl d -minimal -Minimize diff size. -.It Fl I -ignore-matching-lines Ar regexp -Ignore line changes matching -.Ar regexp . -All lines in the change must match -.Ar regexp -for the change to be ignored. -.It Fl i -ignore-case -Do a case-insensitive comparison. -.It Fl t -expand-tabs -Expand tabs to spaces. -.It Fl W -ignore-all-space -Ignore all spaces. -.It Fl B -ignore-blank-lines -Ignore blank lines. -.It Fl E -ignore-tab-expansion -Treat tabs and eight spaces as the same. -.It Fl t -ignore-tabs -Ignore tabs. -.It Fl H -speed-large-files -Assume scattered small changes in a large file. -.It Fl -ignore-file-name-case -Ignore the case of file names. -.It Fl -no-ignore-file-name-case -Do not ignore file name case. -.It Fl -strip-trailing-cr -Skip identical lines. -.It Fl -tabsize Ar NUM -Change the size of tabs (default is 8.) -.El .Sh ENVIRONMENT .Bl -tag -width Ds .It Ev EDITOR , VISUAL @@ -159,16 +63,8 @@ .Sh SEE ALSO .Xr cmp 1 , .Xr diff 1 , +.Xr zdiff 1 , .Xr diff3 1 , .Xr vi 1 , .Xr re_format 7 -.Sh AUTHORS -.Nm -was written from scratch for the public domain by -.An Ray Lai Aq ray@cyth.net . -.Sh CAVEATS -.Pp -Tabs are treated as anywhere from one to eight characters wide, -depending on the current column. -Terminals that treat tabs as eight characters wide will look best.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120816041316.E2249106566B>