summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2007-03-03 19:32:46 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-04 02:59:41 (GMT)
commit723024d696a47556baac77700e47fef288691f37 (patch)
tree6c1d71a57f78ba89d54266cf64ee3a37aaf08251 /combine-diff.c
parent78a8d641c14dc2f0a306d787fa1e42d400b3af4d (diff)
downloadgit-723024d696a47556baac77700e47fef288691f37.zip
git-723024d696a47556baac77700e47fef288691f37.tar.gz
git-723024d696a47556baac77700e47fef288691f37.tar.bz2
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>
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions