Merge branch 'jc/maint-mergetool-read-fix'

diff --git a/progress.h b/progress.h
index 61cb68dfa512bb3668d7e6060262041937aa82d3..611e4c4d42d8d1164add09f926ad5b2ce088db5e 100644 (file)
--- a/progress.h
+++ b/progress.h
@@ -3,11 +3,12 @@
 
 struct progress;
 
-void display_throughput(struct progress *progress, unsigned long n);
+void display_throughput(struct progress *progress, off_t total);
 int display_progress(struct progress *progress, unsigned n);
 struct progress *start_progress(const char *title, unsigned total);
 struct progress *start_progress_delay(const char *title, unsigned total,
                                       unsigned percent_treshold, unsigned delay);
 void stop_progress(struct progress **progress);
+void stop_progress_msg(struct progress **progress, const char *msg);
 
 #endif