Merge branch 'jk/diff-not-so-quick'
commit456a4c08b8d8ddefda939014c15877ace3e3f499
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Jun 2011 18:40:14 +0000 (6 11:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Jun 2011 18:40:14 +0000 (6 11:40 -0700)
tree02e78225fadc62bb3585494b9cb418d833bd8e01
parent6c92972d7f5ab247a8cab5e4b88cb281bf201970
parent28b9264dd6cbadcef8b3e48c24ffcb2893b668b3
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
diff-lib.c
diff.c
diff.h
t/t4040-whitespace-status.sh
tree-diff.c