Skip to content

Commit

Permalink
Merge branch 'sv/maint-diff-q-clear-fix' into maint
Browse files Browse the repository at this point in the history
* sv/maint-diff-q-clear-fix:
  Fix DIFF_QUEUE_CLEAR refactoring
  • Loading branch information
Junio C Hamano committed Aug 3, 2010
2 parents 7b6e6b3 + ee38d82 commit bb89e84
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit bb89e84

Please sign in to comment.