projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1c2c10b) | patch
merge-one-file: make sure we do not mismerge symbolic links.
authorJunio C Hamano <junkio@cox.net>
Fri, 2 Dec 2005 08:54:50 +0000 (00:54 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 2 Dec 2005 09:08:14 +0000 (01:08 -0800)
commit54dd99a127caf4d20e1b91a43949655763d188ed
tree0280c431c8e48fdd702c8c15ce4cc6b89262c583tree | snapshot
parent1c2c10b6e6d86066d68635a2a968c7162498ea41commit | diff
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>
git-merge-one-file.sh diff | blob | history
The core git plumbing