diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-06 11:40:14 -0700 | 
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-06 11:40:14 -0700 | 
| commit | 456a4c08b8d8ddefda939014c15877ace3e3f499 (patch) | |
| tree | 02e78225fadc62bb3585494b9cb418d833bd8e01 /git-gui/lib/diff.tcl | |
| parent | 6c92972d7f5ab247a8cab5e4b88cb281bf201970 (diff) | |
| parent | 28b9264dd6cbadcef8b3e48c24ffcb2893b668b3 (diff) | |
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
Diffstat (limited to 'git-gui/lib/diff.tcl')
0 files changed, 0 insertions, 0 deletions
