merge-recursive: fix longstanding bug in merging symlinks
authorJunio C Hamano <junkio@cox.net>
Mon, 26 Feb 2007 02:42:07 +0000 (18:42 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 26 Feb 2007 03:08:48 +0000 (19:08 -0800)
commit17cd29b...5c0f480a3c6e1dd9617d9c6046e3c280
treee3e8071...cf7c3e5867f8e831843561382c472349copy hash to clipboard (tree)
parent308efc1...d890265a4c62a8b58f025aaf8a1f244dcopy hash to clipboard (diff)
merge-recursive.c