read-tree -u one-way merge fix to check out locally modified paths.
authorJunio C Hamano <junkio@cox.net>
Mon, 15 May 2006 07:46:05 +0000 (00:46 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 15 May 2006 07:46:57 +0000 (00:46 -0700)
commit613f027...9a49337592a32936caa04b1590ca1109
tree42efb6a...2eee4d05b824feeb541145f2d8662f86copy hash to clipboard (tree)
parentc68998f...b5f43717a27da82fac08a76d6588bae7copy hash to clipboard (diff)
read-tree.c