r29643 | cmpilato | 2008-02-29 14:32:44 -0600 (Fri, 29 Feb 2008)

Fix my ifdef-d-out mergeinfo repair/migration svnsync logic to account
for the way svnmerge really stores its data.

* subversion/svnsync/main.c
  (change_dir_prop): Handle the svnmerge-integrated properly (it has
    subtly different syntax than svn:mergeinfo).  Also, drop the
    word "valid" for a notification, as it implies we did some kind
    of validation (which we didn't actually do).

Found by: dglasser