diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-31 11:59:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-31 11:59:39 -0700 |
| commit | e596fd295fbb6e7453cd541554ba27ab185f870d (patch) | |
| tree | 724b2b3c80a66d9ddd10b517278e0e77b20890e0 /xdiff-interface.c | |
| parent | 5b42477b59886a85d4b49a60313f9b9d4a0d576f (diff) | |
| parent | 48672b3dc70e8f70291d974f0eb54cbac7f498e0 (diff) | |
| download | git-e596fd295fbb6e7453cd541554ba27ab185f870d.tar.gz git-e596fd295fbb6e7453cd541554ba27ab185f870d.tar.xz | |
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
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions