Junio C Hamano 70f6be7aa9 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

2012-07-30 13:04:59 -07:00

130 KiB

Raw Blame History

View Raw