Merge branch 'rs/fgrep'

diff --git a/diff.h b/diff.h
index 42582edee68a4a4717ae5debebf37e6b9610fc8f..4d5a32781da81295d5aa1b4dd33dd2765be3ff89 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -78,6 +78,7 @@ struct diff_options {
        const char *a_prefix, *b_prefix;
        unsigned flags;
        int context;
+       int interhunkcontext;
        int break_opt;
        int detect_rename;
        int skip_stat_unmatch;