Merge branch 'np/pack' into next

diff --git a/diff.h b/diff.h
index b3b2c4dd28c4f1a8f14948e5d1262dd71f1e96cf..3027974c1ec74217a58345b4ab48e673ee3db710 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -28,9 +28,12 @@ struct diff_options {
                 with_raw:1,
                 with_stat:1,
                 tree_in_recursive:1,
+                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;