Make git-pull complain and give advice when there is nothing to merge with

diff --git a/progress.h b/progress.h
index 5ae1a89e5a4669553e44d5bd0cc339c308c60c0f..a7c17ca7c4bdad953508d03c20e73022b03bd25a 100644 (file)
--- a/progress.h
+++ b/progress.h
@@ -8,6 +8,7 @@ struct progress {
        unsigned delay;
        unsigned delayed_percent_treshold;
        const char *delayed_title;
+       int need_lf;
 };
 
 int display_progress(struct progress *progress, unsigned n);