Merge branch 'jc/read-tree'
authorJunio C Hamano <junkio@cox.net>
Tue, 25 Jul 2006 04:01:14 +0000 (21:01 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 25 Jul 2006 04:01:14 +0000 (21:01 -0700)
commit325ba14e400d7f0df876a2ddc8e2c85d563313bd
tree2e7c9079ce95bb637019ebe176c4be7bf8e985c8
parent83e12e51c1826b29b5ab2ebcfa13ed99ce98ee98
parentf8f0b1f0e7e96bf996c657d2c5c15e0ba3a4eeac
Merge branch 'jc/read-tree'

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