Merge branch 'jk/add-i-highlight'

* jk/add-i-highlight: add--interactive: allow custom diff highlighting programs

Junio C Hamano committed Apr 3, 2016 at 10:29 UTC 2052c52d9a16fe1d9a091dd0b53ab1806a663999

No changes.