diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-02-06 14:20:15 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-06 14:20:15 -0800 |
commit | b828fef678c21d017f18d2094bfdaac94e5fbf7a (patch) | |
tree | 9aca1a08f3bdcde70d2de9a32ef0360b89b0a053 /config.c | |
parent | e62a641de17b172ffc4d3a803085c8afbfbec3d1 (diff) | |
parent | a0cf49c16ae37177dcfcefa1149bf09f84721cf5 (diff) | |
download | git-b828fef678c21d017f18d2094bfdaac94e5fbf7a.tar.gz git-b828fef678c21d017f18d2094bfdaac94e5fbf7a.tar.xz |
Merge branch 'maint'
* maint:
Fix parsing numeric color values
INSTALL: git-merge no longer uses cpio
Diffstat (limited to 'config.c')
0 files changed, 0 insertions, 0 deletions