From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Jul 2012 20:04:59 +0000 (-0700)
Subject: Merge branch 'jv/maint-no-ext-diff' into maint
X-Git-Tag: v1.7.11.4~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=70f6be7aa9a1f435d64df11ec92ff84982bfc581;p=git.git

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

"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
---

70f6be7aa9a1f435d64df11ec92ff84982bfc581