* contrib/client-side/svn-resolve:   Change expected file names to match what svn currently generates.
* contrib/client-side/svn-resolve:
  Change expected file names to match what svn currently generates.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion