From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Apr 2011 18:36:43 +0000 (-0700)
Subject: Merge branch 'rr/doc-content-type'
X-Git-Tag: v1.7.6-rc0~144
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2a2dbd2770b4dbda59b5b22e19fac973d08d0864;p=git.git

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

2a2dbd2770b4dbda59b5b22e19fac973d08d0864