merge-index: fix longstanding bug in merging symlinks
authorJunio C Hamano <junkio@cox.net>
Mon, 26 Feb 2007 02:17:15 +0000 (18:17 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 26 Feb 2007 03:08:48 +0000 (19:08 -0800)
commit308efc1...d890265a4c62a8b58f025aaf8a1f244d
tree62a546e...00f3364805a7ab036d8845fd259ed6fccopy hash to clipboard (tree)
parent437b1b2...df4b356c9342dac8d38849f24ef44f27copy hash to clipboard (diff)
merge-index.c