Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into maint

diff --git a/trailer.h b/trailer.h
index b997739649a37e8791e8448c2e7daefe8023bb71..203acf4ee1db99ea35a1d202010834330ce4af58 100644 (file)
--- a/trailer.h
+++ b/trailer.h
@@ -72,6 +72,10 @@ struct process_trailer_options {
        int only_input;
        int unfold;
        int no_divider;
+       int value_only;
+       const struct strbuf *separator;
+       int (*filter)(const struct strbuf *, void *);
+       void *filter_data;
 };
 
 #define PROCESS_TRAILER_OPTIONS_INIT {0}