Andrew's git / gitweb.git / diff
?
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Feb 2008 22:20:15 +0000 (14:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Feb 2008 22:20:15 +0000 (14:20 -0800)
* maint:
Fix parsing numeric color values
INSTALL: git-merge no longer uses cpio

Trivial merge