Code

Merge branch 'sv/maint-diff-q-clear-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Aug 2010 22:17:34 +0000 (15:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Aug 2010 22:17:34 +0000 (15:17 -0700)
* sv/maint-diff-q-clear-fix:
  Fix DIFF_QUEUE_CLEAR refactoring

1  2 
diff.c

diff --cc diff.c
Simple merge