summaryrefslogtreecommitdiffstats
path: root/merge.cc
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 11:51:20 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 11:51:20 +0000
commitbfcd82a7a733b8baf02525bbdcb09f8a59aa1f4a (patch)
tree6bc5b4ec421d43bb5231917852d4d73473fec21a /merge.cc
parentAdding upstream version 1.17~rc1. (diff)
downloadlziprecover-bfcd82a7a733b8baf02525bbdcb09f8a59aa1f4a.tar.xz
lziprecover-bfcd82a7a733b8baf02525bbdcb09f8a59aa1f4a.zip
Adding upstream version 1.17~rc2.upstream/1.17_rc2
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
-rw-r--r--merge.cc2
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 );
}