From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Jun 2013 21:30:07 +0000 (-0700)
Subject: Merge branch 'jk/add-i-custom-diff-algo'
X-Git-Tag: v1.8.4-rc0~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91fc159745eccb0830c9719642d07617c8100b41;p=git

Merge branch 'jk/add-i-custom-diff-algo'

* jk/add-i-custom-diff-algo:
  add -i: add extra options at the right place in "diff" command line
  add--interactive: respect diff.algorithm
---

91fc159745eccb0830c9719642d07617c8100b41