Merge branch 'se/tag' into next

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index 70077c6ed938848ba260672f8271a99ecfe9b0a3..3027974c1ec74217a58345b4ab48e673ee3db710 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -33,6 +33,7 @@ struct diff_options {
                 silent_on_remove:1,
                 find_copies_harder:1,
                 summary:1;
+       int context;
        int break_opt;
        int detect_rename;
        int line_termination;