Adding upstream version 1.17~rc2.upstream/1.17_rc2

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 1 insertions, 1 deletions

diff --git a/merge.cc b/merge.cc
index 36c2faf..b2249e6 100644
--- a/merge.cc
+++ b/merge.cc
@@ -471,7 +471,7 @@ int merge_files( const std::vector< std::string > & filenames,
     if( verbosity >= 1 && file_index.members() > 1 )
       {
       std::printf( "Merging member %ld of %ld\n",
-                   j + 1, (long)file_index.members() );
+                   j + 1, file_index.members() );
       std::fflush( stdout );
       }