r71034 somehow deleted all of the metadata for svnmerge. This is my attempt to fix my mistake.