Merge branch 'jc/rerere-train' into maint

diff --git a/diff.h b/diff.h
index dd48eca71ddf1a8709135f158520c8bb7cd5f8d1..3cc1dcf78ad10630ecd7743061251d9f0cf3576f 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -150,6 +150,7 @@ struct diff_options {
        diff_format_fn_t format_callback;
        void *format_callback_data;
        diff_prefix_fn_t output_prefix;
+       int output_prefix_length;
        void *output_prefix_data;
 };