Merge branch 'jk/add-i-highlight'
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2016 17:29:25 +0000 (10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2016 17:29:25 +0000 (10:29 -0700)
* jk/add-i-highlight:
  add--interactive: allow custom diff highlighting programs

1  2 
Documentation/config.txt

Simple merge