Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
merge-one-file: make sure we do not mismerge symbolic links.
We ran "merge" command on O->A, O->B, A!=B case without verifying the path involved is not a symlink. Signed-off-by: Junio C Hamano <junkio@cox.net>
- Loading branch information