Merge branch 'mg/diff-uiconfig-doc'

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

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/diff-options.txt
Simple merge