Reverted r4621, the setting up of svnmerge properties from 1.2 to 1.3.
The following command did not work: svn merge -r4621:4620 .
So instead the following command was used: svn propdel svnmerge-integrated
Authored by: bugman 2008-01-11
Parent: [r4622]
Child: [r4624]
