From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 May 2011 17:49:53 +0000 (-0700)
Subject: Merge branch 'mg/diff-uiconfig-doc'
X-Git-Tag: v1.7.6-rc0~106
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=12b99a3598bddfb26efd188ffac6f0e283f02d5a;p=git.git

Merge branch 'mg/diff-uiconfig-doc'

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

12b99a3598bddfb26efd188ffac6f0e283f02d5a