merge-recursive: fix longstanding bug in merging symlinks
authorJunio C Hamano <junkio@cox.net>
Mon, 26 Feb 2007 02:42:07 +0000 (18:42 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 26 Feb 2007 03:08:48 +0000 (19:08 -0800)
Commit 3af244ca added unlink(2) before running symlink(2) to
update the working tree with the merge result, but it was
unlinking a wrong path. This resulted in loss of the path
pointed by a symlink.

Signed-off-by: Junio C Hamano <junkio@cox.net>
No differences found