Merge branch 'lt/oneway' into next
authorJunio C Hamano <junkio@cox.net>
Mon, 15 May 2006 07:48:00 +0000 (00:48 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 15 May 2006 07:48:00 +0000 (00:48 -0700)
commite8efc9036fd7b793e84af4165fea715794924794
tree2a6caf86a8f5a8f17d251a555344bad5bfeb6bc5
parent5fd51c77faeb362a5429061e595371b7a1c46c02
parent613f02739a49337592a32936caa04b1590ca1109
Merge branch 'lt/oneway' into next

* lt/oneway:
  read-tree -u one-way merge fix to check out locally modified paths.
read-tree.c