diff options
author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 16:12:47 +0000 |
---|---|---|
committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 16:12:47 +0000 |
commit | 4edfc3fca1fdca1e046ad16c42ee0a22ab72bb6f (patch) | |
tree | 1dea8ff881747fb84455151329255c6f1020493b /doc/zdiff.1 | |
parent | Adding debian version 0.6-1. (diff) | |
download | zutils-4edfc3fca1fdca1e046ad16c42ee0a22ab72bb6f.tar.xz zutils-4edfc3fca1fdca1e046ad16c42ee0a22ab72bb6f.zip |
Merging upstream version 0.7.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'doc/zdiff.1')
-rw-r--r-- | doc/zdiff.1 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/zdiff.1 b/doc/zdiff.1 index cf19d27..896d735 100644 --- a/doc/zdiff.1 +++ b/doc/zdiff.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH ZDIFF "1" "October 2009" "Zdiff 0.6" "User Commands" +.TH ZDIFF "1" "October 2009" "Zdiff 0.7" "User Commands" .SH NAME Zdiff \- compare compressed files .SH SYNOPSIS @@ -11,7 +11,7 @@ Zdiff \- Diff/cmp wrapper for compressed files. Zdiff is a wrapper script around the diff and cmp commands that allows transparent comparison of any combination of compressed and non\-compressed files. If any given file is compressed, its uncompressed -content is used. The supported compressors are gzip, bzip2, lzip and xz. +content is used. The supported compressors are bzip2, gzip, lzip and xz. .PP Zcmp is a shortcut for "zdiff \fB\-\-cmp\fR" .PP @@ -19,7 +19,7 @@ Compares FILE1 to FILE2. If FILE2 is omitted and FILE1 is compressed, compares FILE1 to the file with the corresponding decompressed file name (removes the extension from FILE1). If FILE2 is omitted and FILE1 is not compressed, compares FILE1 to the uncompressed contents of -FILE1.[gz|bz2|lz|xz] (the first one that is found). +FILE1.[bz2|gz|lz|xz] (the first one that is found). DIFF_OPTIONS are passed directly to diff or cmp. The exit status from diff or cmp is preserved. .SH OPTIONS |