[PATCH] Eliminate spurious svnmerge-integrated property conflicts