From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 May 2011 16:41:11 +0000 (-0700)
Subject: Merge branch 'mg/diff-uiconfig-doc' into maint
X-Git-Tag: v1.7.5.3~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5f8937db39c4eb495a48931172348200a91821a3;p=git.git

Merge branch 'mg/diff-uiconfig-doc' into maint

* mg/diff-uiconfig-doc:
  config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
---

5f8937db39c4eb495a48931172348200a91821a3