1
0
Fork 0

Adding upstream version 1.18~pre1.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-21 11:25:32 +01:00
parent f06ff1621d
commit cf6c2d1d59
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
17 changed files with 452 additions and 200 deletions

View file

@ -480,12 +480,12 @@ int merge_files( const std::vector< std::string > & filenames,
{
done = try_merge_member( mpos, msize, block_vector, color_vector,
infd_vector, output_filename, outfd, verbosity );
if( !done && verbosity >= 1 ) std::fputs( "\n", stdout );
if( !done && verbosity >= 1 ) std::fputc( '\n', stdout );
}
if( !done )
done = try_merge_member1( mpos, msize, block_vector, color_vector,
infd_vector, output_filename, outfd, verbosity );
if( verbosity >= 1 ) std::fputs( "\n", stdout );
if( verbosity >= 1 ) std::fputc( '\n', stdout );
if( !done )
{
if( verbosity >= 2 )