commit | 5f8937db39c4eb495a48931172348200a91821a3 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Thu May 26 09:41:11 2011 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Thu May 26 09:41:11 2011 -0700 |
tree | 7c34918c45f02e8543c910c16dbf51d69913727c | |
parent | b73f3d2c7db2e4d9f02ff9d24852685bcb6fa38a [diff] | |
parent | 6999c54029b42ea996c2fff4fa37303f79b9d8c2 [diff] |
Merge branch 'mg/diff-uiconfig-doc' into maint * mg/diff-uiconfig-doc: config.txt,diff-options.txt: porcelain vs. plumbing for color.diff