![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Nov 2008 19:57:31 +0000 (11:57 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Nov 2008 19:57:31 +0000 (11:57 -0800) | ||
| commit | aa14a0c3f191ee4df7344eed119be5b4a527a0ff | |
| tree | 1f0b79d76fef5d196d2aeed2e858c2866e71a6a0 | tree | snapshot |
| parent | 78a0014d807dd74aec160c6fc6db8e2fb7e7e9b1 | commit | diff |
| parent | 5aa3bdd50d4e4f59c41ee6e70ae1e738a3a28cc0 | commit | diff |
Merge branch 'maint'
* maint:
Teach "git diff" to honour --[no-]ext-diff
* maint:
Teach "git diff" to honour --[no-]ext-diff
| builtin-diff.c | diff1 | | diff2 | | blob | history |
| t/t4020-diff-external.sh | diff1 | | diff2 | | blob | history |