Merging upstream version 1.6.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
b821a3696e
commit
e9522df0a4
30 changed files with 436 additions and 473 deletions
16
doc/zdiff.1
16
doc/zdiff.1
|
@ -1,5 +1,5 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1.
|
||||
.TH ZDIFF "1" "May 2016" "zdiff (zutils) 1.5" "User Commands"
|
||||
.TH ZDIFF "1" "April 2017" "zdiff (zutils) 1.6" "User Commands"
|
||||
.SH NAME
|
||||
zdiff \- decompress and compare two files line by line
|
||||
.SH SYNOPSIS
|
||||
|
@ -14,17 +14,17 @@ temporary filenames instead of those specified.
|
|||
.PP
|
||||
The supported formats are bzip2, gzip, lzip and xz.
|
||||
.PP
|
||||
Compares <file1> to <file2>. If <file2> is omitted zdiff tries the
|
||||
Zdiff compares file1 to file2. If file2 is omitted zdiff tries the
|
||||
following:
|
||||
.IP
|
||||
1. If <file1> is compressed, compares its decompressed contents with
|
||||
the corresponding uncompressed file (the name of <file1> with the
|
||||
1. 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
|
||||
contents of <file1>.[lz|bz2|gz|xz] (the first one that is found).
|
||||
2. 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
|
||||
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.
|
||||
|
@ -109,7 +109,7 @@ Report bugs to zutils\-bug@nongnu.org
|
|||
.br
|
||||
Zutils home page: http://www.nongnu.org/zutils/zutils.html
|
||||
.SH COPYRIGHT
|
||||
Copyright \(co 2016 Antonio Diaz Diaz.
|
||||
Copyright \(co 2017 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.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue