Merge branch 'mg/diff-uiconfig-doc'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:49:53 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:49:53 +0000 (10:49 -0700)
commit12b99a3598bddfb26efd188ffac6f0e283f02d5a
treea0f29d790c353c744bf812b9b306dc03e8921856
parentef6b43a44b5e25afe6eee32fcfda7d2a738cec3c
parent6999c54029b42ea996c2fff4fa37303f79b9d8c2
Merge branch 'mg/diff-uiconfig-doc'

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