Merge branch 'mg/diff-uiconfig-doc'

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

Junio C Hamano committed May 6, 2011 at 10:49 UTC 12b99a3598bddfb26efd188ffac6f0e283f02d5a

No changes.