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

diff --git a/trailer.h b/trailer.h
index 5255b676de24004cd93f0d6a36d5a1b22fad997f..203acf4ee1db99ea35a1d202010834330ce4af58 100644 (file)
--- a/trailer.h
+++ b/trailer.h
@@ -72,6 +72,8 @@ 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;
 };