Remove empty svn:mergeinfo properties. This should reduce the amount of differences between trunk and release.