From f7ab1e0adfeb1cfa831baf401bd86cf6cafd2b50 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 8 Nov 2015 05:41:14 +0100 Subject: Adding upstream version 1.4. Signed-off-by: Daniel Baumann --- zdiff.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'zdiff.cc') diff --git a/zdiff.cc b/zdiff.cc index e14f9b0..1e03356 100644 --- a/zdiff.cc +++ b/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= exclude formats not in \n" + " -M, --format= process only the formats in \n" " -N, --no-rcfile don't read runtime configuration file\n" " -O, --force-format=[][,] 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= set compressor and options for bzip2 format\n" " --gz= set compressor and options for gzip format\n" " --lz= set compressor and options for lzip format\n" - " --xz= 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= set compressor and options for xz format\n" ); show_help_addr(); } -- cgit v1.2.3