From: Junio C Hamano <junkio@cox.net>
Date: Tue, 25 Jul 2006 04:01:14 +0000 (-0700)
Subject: Merge branch 'jc/read-tree'
X-Git-Tag: v1.4.2-rc2~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=325ba14e400d7f0df876a2ddc8e2c85d563313bd;p=git.git

Merge branch 'jc/read-tree'

* jc/read-tree:
  checkout -f failed to check out a file if an existing directory interfered.
---

325ba14e400d7f0df876a2ddc8e2c85d563313bd