From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Jul 2012 03:56:03 +0000 (-0700)
Subject: Merge branch 'jv/maint-no-ext-diff'
X-Git-Tag: v1.7.12-rc0~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ccb9459736e9cfcc543229a4ac3e7039e2d54e3;p=git

Merge branch 'jv/maint-no-ext-diff'

"git diff --no-ext-diff" did not output anything for a typechange
filepair when GIT_EXTERNAL_DIFF is in effect.

* jv/maint-no-ext-diff:
  diff: test precedence of external diff drivers
  diff: correctly disable external_diff with --no-ext-diff
---

7ccb9459736e9cfcc543229a4ac3e7039e2d54e3