From: Junio C Hamano <junkio@cox.net>
Date: Sat, 17 Mar 2007 07:33:17 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1589e0517fd22c198799504d6888d5a475024152;p=git.git

Merge branch 'maint'

* maint:
  git-merge: finish when git-read-tree fails
---

1589e0517fd22c198799504d6888d5a475024152