summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-26 09:41:11 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-26 09:41:11 -0700
commit5f8937db39c4eb495a48931172348200a91821a3 (patch)
tree7c34918c45f02e8543c910c16dbf51d69913727c /Makefile
parentb73f3d2c7db2e4d9f02ff9d24852685bcb6fa38a (diff)
parent6999c54029b42ea996c2fff4fa37303f79b9d8c2 (diff)
downloadgit-5f8937db39c4eb495a48931172348200a91821a3.tar.gz
Merge branch 'mg/diff-uiconfig-doc' into maint
* mg/diff-uiconfig-doc: config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions