From: Junio C Hamano Date: Tue, 21 Feb 2012 23:25:39 +0000 (-0800) Subject: Merge branch 'jk/diff-highlight' X-Git-Tag: v1.7.10-rc0~65 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d30146ac5f92fd5e60bdc106dfe01a69b3d45d27;p=git.git Merge branch 'jk/diff-highlight' * 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 --- d30146ac5f92fd5e60bdc106dfe01a69b3d45d27