socsvn commit: r240477 - soc2012/jhagewood/sdiff
jhagewood at FreeBSD.org
jhagewood at FreeBSD.org
Fri Aug 17 17:02:44 UTC 2012
Author: jhagewood
Date: Fri Aug 17 17:02:41 2012
New Revision: 240477
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240477
Log:
compiled zdiff man file
Added:
soc2012/jhagewood/sdiff/zsdiff-man.txt
Added: soc2012/jhagewood/sdiff/zsdiff-man.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ soc2012/jhagewood/sdiff/zsdiff-man.txt Fri Aug 17 17:02:41 2012 (r240477)
@@ -0,0 +1,32 @@
+ZSDIFF(1) FreeBSD General Commands Manual ZSDIFF(1)
+
+NAME
+ zsdiff -- side-by-side diff of compressed files.
+
+SYNOPSIS
+ zsdiff [-abdilstW] [-I regexp] [-o outfile] [-w width] file1 file2
+
+DESCRIPTION
+ zsdiff displays two files side by side, with any differences between the
+ two highlighted as follows: new lines are marked with `>'; deleted lines
+ are marked with `<'; and changed lines are marked with `|'.
+
+ zsdiff can also be used to interactively merge two files, prompting at
+ each set of differences.
+
+ See sdiff(1) for options.
+
+ENVIRONMENT
+ EDITOR, VISUAL
+ Specifies an editor to use with the -o option. If both EDITOR
+ and VISUAL are set, VISUAL takes precedence. If neither EDITOR
+ nor VISUAL are set, the default is vi(1).
+
+ TMPDIR Specifies a directory for temporary files to be created. The
+ default is /tmp.
+
+SEE ALSO
+ cmp(1), diff(1), zdiff(1), diff3(1), vi(1), re_format(7)
+
+
+FreeBSD 9.0 August 16, 2012 FreeBSD 9.0
More information about the svn-soc-all
mailing list