diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-08-03 15:17:34 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-08-03 15:17:34 -0700 |
commit | bb89e84f95a4885dffc9562137139a3ab4f1e05c (patch) | |
tree | 3eebeadaeaa0d830516055643287f19171825fec | |
parent | 7b6e6b3fb25db0e80ec331ed0a1eb8eb9edc2c84 (diff) | |
parent | ee38d823f74bd8872c1e793f98a5b5523ee04646 (diff) | |
download | git-bb89e84f95a4885dffc9562137139a3ab4f1e05c.tar.gz git-bb89e84f95a4885dffc9562137139a3ab4f1e05c.tar.xz |
Merge branch 'sv/maint-diff-q-clear-fix' into maint
* sv/maint-diff-q-clear-fix:
Fix DIFF_QUEUE_CLEAR refactoring
-rw-r--r-- | diff.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -2814,7 +2814,6 @@ static void run_checkdiff(struct diff_filepair *p, struct diff_options *o) void diff_setup(struct diff_options *options) { memset(options, 0, sizeof(*options)); - memset(&diff_queued_diff, 0, sizeof(diff_queued_diff)); options->file = stdout; |