diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-27 11:36:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-27 11:36:43 -0700 |
| commit | 2a2dbd2770b4dbda59b5b22e19fac973d08d0864 (patch) | |
| tree | f59f00d92e92a4fc342779c0aa8e750aaef6a445 /t/t3030-merge-recursive.sh | |
| parent | Merge branch 'jc/merge-dash-previous' (diff) | |
| parent | Documentation: Allow custom diff tools to be specified in 'diff.tool' (diff) | |
| download | tgif-2a2dbd2770b4dbda59b5b22e19fac973d08d0864.tar.xz | |
Merge branch 'rr/doc-content-type'
* 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 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions