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
1 file changed