Report symlink failures in merge-recursive
commit304dcf262e3f8524c909a13cf73a67522be6353b
authorAlex Riesen <raa.lkml@gmail.com>
Fri, 5 Dec 2008 00:39:14 +0000 (5 01:39 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Dec 2008 02:05:51 +0000 (4 18:05 -0800)
tree3e7c598fbe8eab872c38a55fa9f4469a7a44fa82
parent7be77de266b5cbcbd28d69a04df6f0b167b87cf6
Report symlink failures in merge-recursive

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c