diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-07-30 13:04:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-30 13:04:59 -0700 |
| commit | 70f6be7aa9a1f435d64df11ec92ff84982bfc581 (patch) | |
| tree | b224954a0348a3e3efcf07e67b752157938755cf /t/t6031-merge-recursive.sh | |
| parent | Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maint (diff) | |
| parent | diff: test precedence of external diff drivers (diff) | |
| download | tgif-70f6be7aa9a1f435d64df11ec92ff84982bfc581.tar.xz | |
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
Diffstat (limited to 't/t6031-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions