Merging upstream version 1.0~rc6.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
c9cf79d40a
commit
7a527f6c7c
25 changed files with 1114 additions and 772 deletions
doc
10
doc/zdiff.1
10
doc/zdiff.1
|
@ -1,5 +1,5 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1.
|
||||
.TH ZDIFF "1" "January 2011" "Zdiff (zutils) 0.9" "User Commands"
|
||||
.TH ZDIFF "1" "March 2013" "Zdiff (zutils) 1.0-rc6" "User Commands"
|
||||
.SH NAME
|
||||
Zdiff \- decompress and compare two files line by line
|
||||
.SH SYNOPSIS
|
||||
|
@ -11,7 +11,8 @@ differ, shows the differences line by line. If any given file is
|
|||
compressed, its uncompressed 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.
|
||||
The supported compressors are bzip2, gzip, lzip and xz.
|
||||
.PP
|
||||
The supported formats are bzip2, gzip, lzip and xz.
|
||||
.PP
|
||||
Compares <file1> to <file2>. If <file2> is omitted zdiff tries the
|
||||
following:
|
||||
|
@ -53,6 +54,9 @@ try hard to find a smaller set of changes
|
|||
\fB\-E\fR, \fB\-\-ignore\-tab\-expansion\fR
|
||||
ignore changes due to tab expansion
|
||||
.TP
|
||||
\fB\-\-format\fR=\fI[\fR<fmt1>][,<fmt2>]
|
||||
force given formats (bz2, gz, lz, xz)
|
||||
.TP
|
||||
\fB\-i\fR, \fB\-\-ignore\-case\fR
|
||||
ignore case differences in file contents
|
||||
.TP
|
||||
|
@ -87,7 +91,7 @@ Report bugs to zutils\-bug@nongnu.org
|
|||
.br
|
||||
Zutils home page: http://www.nongnu.org/zutils/zutils.html
|
||||
.SH COPYRIGHT
|
||||
Copyright \(co 2011 Antonio Diaz Diaz.
|
||||
Copyright \(co 2013 Antonio Diaz Diaz.
|
||||
License GPLv3+: GNU GPL version 3 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