tree 00d4bc06e2ddcce925c2168bb01cb89202ff3d28
parent db7df127e50599518290e5f7e6e4fed2d8267483
author Zac Medico <zmedico@gentoo.org> 1254608831 -0000
committer Zac Medico <zmedico@gentoo.org> 1254608831 -0000

Generate an eerror message in dblink.mergeme when a file has to be renamed in
order to merge a directory to the same path.

svn path=/main/trunk/; revision=14485