Handle core.symlinks=false case in merge-recursive.
authorJohannes Sixt <johannes.sixt@telecom.at>
Sat, 3 Mar 2007 19:32:46 +0000 (20:32 +0100)
committerJunio C Hamano <junkio@cox.net>
Sun, 4 Mar 2007 02:59:41 +0000 (18:59 -0800)
commit723024d...96a47556baac77700e47fef288691f37
tree6c1d71a...7f78ba89d54266cf64ee3a37aaf08251copy hash to clipboard (tree)
parent78a8d64...c14dc2f0a306d787fa1e42d400b3af4dcopy hash to clipboard (diff)
merge-recursive.c
t/t6025-merge-symlinks.sh [new file with mode: 0644]