Code

Merge branch 'mg/diff-uiconfig-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 16:41:11 +0000 (09:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 16:41:11 +0000 (09:41 -0700)
* mg/diff-uiconfig-doc:
  config.txt,diff-options.txt: porcelain vs. plumbing for color.diff

1  2 
Documentation/config.txt
Documentation/diff-options.txt

Simple merge
Simple merge