Merging upstream version 1.4~pre2.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
454cd28d9e
commit
06e5e699b7
30 changed files with 802 additions and 552 deletions
13
doc/zdiff.1
13
doc/zdiff.1
|
@ -1,5 +1,5 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1.
|
||||
.TH ZDIFF "1" "August 2014" "zdiff (zutils) 1.3" "User Commands"
|
||||
.TH ZDIFF "1" "April 2015" "zdiff (zutils) 1.4-pre2" "User Commands"
|
||||
.SH NAME
|
||||
zdiff \- decompress and compare two files line by line
|
||||
.SH SYNOPSIS
|
||||
|
@ -57,15 +57,18 @@ 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
|
||||
\fB\-M\fR, \fB\-\-format=\fR<list>
|
||||
exclude formats not in <list>
|
||||
.TP
|
||||
\fB\-N\fR, \fB\-\-no\-rcfile\fR
|
||||
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)
|
||||
.TP
|
||||
\fB\-p\fR, \fB\-\-show\-c\-function\fR
|
||||
show which C function each change is in
|
||||
.TP
|
||||
|
@ -109,7 +112,7 @@ Report bugs to zutils\-bug@nongnu.org
|
|||
.br
|
||||
Zutils home page: http://www.nongnu.org/zutils/zutils.html
|
||||
.SH COPYRIGHT
|
||||
Copyright \(co 2014 Antonio Diaz Diaz.
|
||||
Copyright \(co 2015 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