fix svnmerge properties