Merging upstream version 1.4.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
0fcc2a9007
commit
799d754a32
18 changed files with 115 additions and 119 deletions
6
zdiff.cc
6
zdiff.cc
|
@ -76,7 +76,7 @@ void show_help()
|
|||
" -d, --minimal try hard to find a smaller set of changes\n"
|
||||
" -E, --ignore-tab-expansion ignore changes due to tab expansion\n"
|
||||
" -i, --ignore-case ignore case differences in file contents\n"
|
||||
" -M, --format=<list> exclude formats not in <list>\n"
|
||||
" -M, --format=<list> process only the formats in <list>\n"
|
||||
" -N, --no-rcfile don't read runtime configuration file\n"
|
||||
" -O, --force-format=[<f1>][,<f2>] force given formats (bz2, gz, lz, xz)\n"
|
||||
" -p, --show-c-function show which C function each change is in\n"
|
||||
|
@ -90,9 +90,7 @@ void show_help()
|
|||
" --bz2=<command> set compressor and options for bzip2 format\n"
|
||||
" --gz=<command> set compressor and options for gzip format\n"
|
||||
" --lz=<command> set compressor and options for lzip format\n"
|
||||
" --xz=<command> set compressor and options for xz format\n"
|
||||
"Numbers may be followed by a multiplier: k = kB = 10^3 = 1000,\n"
|
||||
"Ki = KiB = 2^10 = 1024, M = 10^6, Mi = 2^20, G = 10^9, Gi = 2^30, etc...\n" );
|
||||
" --xz=<command> set compressor and options for xz format\n" );
|
||||
show_help_addr();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue