Merge branch 'jk/diff-highlight'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Feb 2012 23:25:39 +0000 (15:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Feb 2012 23:25:39 +0000 (15:25 -0800)
* jk/diff-highlight:
diff-highlight: document some non-optimal cases
diff-highlight: match multi-line hunks
diff-highlight: refactor to prepare for multi-line hunks
diff-highlight: don't highlight whole lines
diff-highlight: make perl strict and warnings fatal

Trivial merge