Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
merge-recursive: fix longstanding bug in merging symlinks
Commit 3af244c 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>
- Loading branch information