From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 3 Apr 2016 17:29:25 +0000 (-0700)
Subject: Merge branch 'jk/add-i-highlight'
X-Git-Tag: v2.9.0-rc0~174
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2052c52d9a16fe1d9a091dd0b53ab1806a663999;p=thirdparty%2Fgit.git

Merge branch 'jk/add-i-highlight'

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

2052c52d9a16fe1d9a091dd0b53ab1806a663999