Merge branch 'np/pack' into next

diff --git a/diff.h b/diff.h
index d052608404314880652561e4296e05e9da3f96ca..3027974c1ec74217a58345b4ab48e673ee3db710 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -31,7 +31,9 @@ struct diff_options {
                 binary:1,
                 full_index:1,
                 silent_on_remove:1,
-                find_copies_harder:1;
+                find_copies_harder:1,
+                summary:1;
+       int context;
        int break_opt;
        int detect_rename;
        int line_termination;