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)
commit54dd99a...27caf4d20e1b91a43949655763d188ed
tree0280c43...c8e48fdd702c8c15ce4cc6b89262c583copy hash to clipboard (tree)
parent1c2c10b...e6d86066d68635a2a968c7162498ea41copy hash to clipboard (diff)
git-merge-one-file.sh