diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:23:45 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:23:54 -0700 |
commit | 1c88a6d17492b197b9b3298cbc34efa804928302 (patch) | |
tree | b0370caa6322930a13898673c5a559aef20c8791 /builtin/apply.c | |
parent | 31190841049549b5daaffeb0b9888ebed0bbfc8a (diff) | |
parent | e09e4024a070e666ed40b66442e8151b91d623e4 (diff) | |
download | git-1c88a6d17492b197b9b3298cbc34efa804928302.tar.gz |
Sync with 1.7.11.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/apply.c')
-rw-r--r-- | builtin/apply.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index d453c83378..3bf71dc452 100644 --- 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; |