Merge branch 'jk/diff-not-so-quick'

* jk/diff-not-so-quick: diff: futureproof "stop feeding the backend early" logic diff_tree: disable QUICK optimization with diff filter Conflicts: diff.c

Junio C Hamano committed Jun 6, 2011 at 11:40 UTC 456a4c08b8d8ddefda939014c15877ace3e3f499

No changes.