![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 May 2011 18:59:39 +0000 (11:59 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 May 2011 18:59:39 +0000 (11:59 -0700) | ||
| commit | e596fd295fbb6e7453cd541554ba27ab185f870d | |
| tree | 724b2b3c80a66d9ddd10b517278e0e77b20890e0 | tree | snapshot |
| parent | 5b42477b59886a85d4b49a60313f9b9d4a0d576f | commit | diff |
| parent | 48672b3dc70e8f70291d974f0eb54cbac7f498e0 | commit | diff |
Merge branch 'rr/doc-content-type' into maint
* rr/doc-content-type:
Documentation: Allow custom diff tools to be specified in 'diff.tool'
Documentation: Add diff.<driver>.* to config
Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
Documentation: Add filter.<driver>.* to config
* rr/doc-content-type:
Documentation: Allow custom diff tools to be specified in 'diff.tool'
Documentation: Add diff.<driver>.* to config
Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
Documentation: Add filter.<driver>.* to config
| Documentation/config.txt | diff1 | | diff2 | | blob | history |