| commit | 17cd29b25c0f480a3c6e1dd9617d9c6046e3c280 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 26 Feb 2007 02:42:07 +0000 (25 18:42 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 26 Feb 2007 03:08:48 +0000 (25 19:08 -0800) | ||
| tree | e3e8071ecf7c3e5867f8e831843561382c472349 | treesnapshot (tar.gz zip) |
| parent | 308efc10d890265a4c62a8b58f025aaf8a1f244d | commitdiff |
merge-recursive: fix longstanding bug in merging symlinks
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>
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>
| merge-recursive.c | diffblobblamehistory |