Merging upstream version 1.14~rc1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
1ef198b95d
commit
acae34f9f5
26 changed files with 387 additions and 232 deletions
6
zdiff.cc
6
zdiff.cc
|
@ -268,7 +268,7 @@ int main( const int argc, const char * const argv[] )
|
|||
{ 'a', "text", Arg_parser::no },
|
||||
{ 'b', "ignore-space-change", Arg_parser::no },
|
||||
{ 'B', "ignore-blank-lines", Arg_parser::no },
|
||||
{ 'c', 0, Arg_parser::no },
|
||||
{ 'c', 0, Arg_parser::no },
|
||||
{ 'C', "context", Arg_parser::yes },
|
||||
{ 'd', "minimal", Arg_parser::no },
|
||||
{ 'E', "ignore-tab-expansion", Arg_parser::no },
|
||||
|
@ -282,7 +282,7 @@ int main( const int argc, const char * const argv[] )
|
|||
{ 's', "report-identical-files", Arg_parser::no },
|
||||
{ 't', "expand-tabs", Arg_parser::no },
|
||||
{ 'T', "initial-tab", Arg_parser::no },
|
||||
{ 'u', 0, Arg_parser::no },
|
||||
{ 'u', 0, Arg_parser::no },
|
||||
{ 'U', "unified", Arg_parser::yes },
|
||||
{ 'v', "verbose", Arg_parser::no },
|
||||
{ 'V', "version", Arg_parser::no },
|
||||
|
@ -294,7 +294,7 @@ int main( const int argc, const char * const argv[] )
|
|||
{ lz_opt, "lz", Arg_parser::yes },
|
||||
{ xz_opt, "xz", Arg_parser::yes },
|
||||
{ zst_opt, "zst", Arg_parser::yes },
|
||||
{ 0, 0, Arg_parser::no } };
|
||||
{ 0, 0, Arg_parser::no } };
|
||||
|
||||
const Arg_parser parser( argc, argv, options );
|
||||
if( parser.error().size() ) // bad option
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue