Johannes Sixt 723024d696 Handle core.symlinks=false case in merge-recursive. ...

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>

2007-03-03 18:59:41 -08:00

35 KiB

Raw Blame History

View Raw