Merge branch 'jn/maint-trim-vim-contrib' into maint

diff --git a/diff.h b/diff.h
index a658f85f2bc87864f673f737f70c8ad366ab7153..a47bae48d5d14a321108aac3b3de3892587b264f 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -335,5 +335,6 @@ extern int parse_rename_score(const char **cp_p);
 
 extern int print_stat_summary(FILE *fp, int files,
                              int insertions, int deletions);
+extern void setup_diff_pager(struct diff_options *);
 
 #endif /* DIFF_H */