Merge branch 'jc/dotdot-is-parent-directory'

diff --git a/builtin/apply.c b/builtin/apply.c
index 0ab81e34350749a1426c4b338bfcb48313ba8a27..537d33b06103e76fa3611c0ccf329c22897807d9 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -188,7 +188,6 @@ struct patch {
        int is_new, is_delete;  /* -1 = unknown, 0 = false, 1 = true */
        int rejected;
        unsigned ws_rule;
-       unsigned long deflate_origlen;
        int lines_added, lines_deleted;
        int score;
        unsigned int is_toplevel_relative:1;