1
0
Fork 0

Merging upstream version 1.3~pre1.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-24 05:48:02 +01:00
parent 10a38762e2
commit 2cbf3271a3
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
31 changed files with 976 additions and 1312 deletions

View file

@ -3,7 +3,7 @@
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@ -328,14 +328,14 @@ int main( const int argc, const char * const argv[] )
case 'T': diff_args.push_back( "-T" ); break;
case 'u': diff_args.push_back( "-u" ); break;
case 'U': diff_args.push_back( "-U" ); diff_args.push_back( arg ); break;
case 'V': show_version( "Zdiff" ); return 0;
case 'V': show_version(); return 0;
case 'w': diff_args.push_back( "-w" ); break;
case format_opt: parse_format_types( arg, format_types ); break;
case bz2_opt: parse_compressor( arg, fmt_bz2 ); break;
case gz_opt: parse_compressor( arg, fmt_gz ); break;
case lz_opt: parse_compressor( arg, fmt_lz ); break;
case xz_opt: parse_compressor( arg, fmt_xz ); break;
default : internal_error( "uncaught option" );
default : internal_error( "uncaught option." );
}
} // end process options