Merge branch 'mg/diff-uiconfig-doc' into maint
* mg/diff-uiconfig-doc: config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
Junio C Hamano committed
May 26, 2011 at 09:41 UTC
5f8937db39c4eb495a48931172348200a91821a3
No changes.