diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-23 20:56:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-23 20:56:03 -0700 |
| commit | 7ccb9459736e9cfcc543229a4ac3e7039e2d54e3 (patch) | |
| tree | 25851cbb02b1a08558ce5763cee4617939f7bfb7 /builtin | |
| parent | a7fe78a8953a1c4d8abcb36f28133078a778b8d2 (diff) | |
| parent | c12f82ae631eb07d0ee6a61003754d103025a0b3 (diff) | |
| download | git-7ccb9459736e9cfcc543229a4ac3e7039e2d54e3.tar.gz git-7ccb9459736e9cfcc543229a4ac3e7039e2d54e3.tar.xz | |
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
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions