Andrew's git / gitweb.git / diff
?
Merge branch 'jv/maint-no-ext-diff' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Jul 2012 20:04:59 +0000 (13:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Jul 2012 20:04:59 +0000 (13:04 -0700)
"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

1  2 
diff.c patch | diff1 | diff2 | blob | history
t/t4020-diff-external.sh patch | diff1 | diff2 | blob | history
diff --cc diff.c
Simple merge
diff --cc t/t4020-diff-external.sh
Simple merge