![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Feb 2008 22:20:15 +0000 (14:20 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Feb 2008 22:20:15 +0000 (14:20 -0800) | ||
| commit | b828fef678c21d017f18d2094bfdaac94e5fbf7a | |
| tree | 9aca1a08f3bdcde70d2de9a32ef0360b89b0a053 | tree | snapshot |
| parent | e62a641de17b172ffc4d3a803085c8afbfbec3d1 | commit | diff |
| parent | a0cf49c16ae37177dcfcefa1149bf09f84721cf5 | commit | diff |
Merge branch 'maint'
* maint:
Fix parsing numeric color values
INSTALL: git-merge no longer uses cpio
* maint:
Fix parsing numeric color values
INSTALL: git-merge no longer uses cpio