From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Feb 2008 22:20:15 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc0~250
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b828fef678c21d017f18d2094bfdaac94e5fbf7a;p=git.git

Merge branch 'maint'

* maint:
  Fix parsing numeric color values
  INSTALL: git-merge no longer uses cpio
---

b828fef678c21d017f18d2094bfdaac94e5fbf7a