From bfcd82a7a733b8baf02525bbdcb09f8a59aa1f4a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 12:51:20 +0100 Subject: Adding upstream version 1.17~rc2. Signed-off-by: Daniel Baumann --- merge.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'merge.cc') 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 ); } -- cgit v1.2.3