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

* sv/maint-diff-q-clear-fix:
  Fix DIFF_QUEUE_CLEAR refactoring
diff.c