summaryrefslogtreecommitdiff
path: root/t/t6025-merge-symlinks.sh
AgeCommit message (Collapse)AuthorFilesLines
2007-03-03Handle core.symlinks=false case in merge-recursive.Libravatar Johannes Sixt1-0/+62
If the file system does not support symbolic links (core.symlinks=false), merge-recursive must write the merged symbolic link text into a regular file. While we are here, fix a tiny memory leak in the if-branch that writes real symbolic links. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <junkio@cox.net>