diff options
Diffstat (limited to 'doc/zdiff.1')
| -rw-r--r-- | doc/zdiff.1 | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/doc/zdiff.1 b/doc/zdiff.1 index 4edcf5e..7d8d387 100644 --- a/doc/zdiff.1 +++ b/doc/zdiff.1 @@ -1,33 +1,32 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1. -.TH ZDIFF "1" "January 2019" "zdiff (zutils) 1.8" "User Commands" +.TH ZDIFF "1" "June 2020" "zdiff (zutils) 1.9" "User Commands" .SH NAME zdiff \- decompress and compare two files line by line .SH SYNOPSIS .B zdiff [\fI\,options\/\fR] \fI\,file1 \/\fR[\fI\,file2\/\fR] .SH DESCRIPTION -Zdiff compares two files ('\-' means standard input), and if they -differ, shows the differences line by line. If any given file is -compressed, its decompressed content is used. Zdiff is a front end to -the diff program and has the limitation that messages from diff refer to -temporary filenames instead of those specified. +zdiff compares two files and, if they differ, writes to standard output the +differences line by line. A hyphen '\-' used as a file argument means standard +input. If any file given is compressed, its decompressed content is used. +zdiff is a front end to the program diff and has the limitation that messages +from diff refer to temporary file names instead of those specified. .PP -The formats supported are bzip2, gzip, lzip and xz. +The formats supported are bzip2, gzip, lzip, and xz. .PP -Zdiff compares file1 to file2. If file2 is omitted zdiff tries the +zdiff compares file1 to file2. The standard input is used only if file1 or +file2 refers to standard input. If file2 is omitted zdiff tries the following: .IP -1. If file1 is compressed, compares its decompressed contents with +\- If file1 is compressed, compares its decompressed contents with the corresponding uncompressed file (the name of file1 with the extension removed). .IP -2. If file1 is uncompressed, compares it with the decompressed +\- If file1 is uncompressed, compares it with the decompressed contents of file1.[lz|bz2|gz|xz] (the first one that is found). -.IP -3. If no suitable file is found, compares file1 with data read from -standard input. .PP Exit status is 0 if inputs are identical, 1 if different, 2 if trouble. +Some options only work if the diff program used supports them. .SH OPTIONS .TP \fB\-h\fR, \fB\-\-help\fR @@ -67,7 +66,7 @@ process only the formats in <list> don't read runtime configuration file .TP \fB\-O\fR, \fB\-\-force\-format\fR=\fI\,[\/\fR<f1>][,<f2>] -force given formats (bz2, gz, lz, xz) +force the formats given (bz2, gz, lz, xz) .TP \fB\-p\fR, \fB\-\-show\-c\-function\fR show which C function each change is in @@ -93,6 +92,12 @@ same as \fB\-u\fR but use <n> lines of context \fB\-w\fR, \fB\-\-ignore\-all\-space\fR ignore all white space .TP +\fB\-W\fR, \fB\-\-width=\fR<n> +output at most <n> print columns +.TP +\fB\-y\fR, \fB\-\-side\-by\-side\fR +output in two columns +.TP \fB\-\-bz2=\fR<command> set compressor and options for bzip2 format .TP @@ -109,7 +114,7 @@ Report bugs to zutils\-bug@nongnu.org .br Zutils home page: http://www.nongnu.org/zutils/zutils.html .SH COPYRIGHT -Copyright \(co 2019 Antonio Diaz Diaz. +Copyright \(co 2020 Antonio Diaz Diaz. License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html> .br This is free software: you are free to change and redistribute it. |