author | Junio C Hamano <gitster@pobox.com> | |
Wed, 27 Apr 2011 18:36:43 +0000 (11:36 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 27 Apr 2011 18:36:43 +0000 (11:36 -0700) |
* 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: 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
1 | 2 | |||
---|---|---|---|---|
Documentation/config.txt | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/config.txt
Simple merge