From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 May 2011 18:59:39 +0000 (-0700)
Subject: Merge branch 'rr/doc-content-type' into maint
X-Git-Tag: v1.7.5.4~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e596fd295fbb6e7453cd541554ba27ab185f870d;p=git.git

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
---

e596fd295fbb6e7453cd541554ba27ab185f870d