Minor svnmerge.py cleanup.
Minor svnmerge.py cleanup.

* contrib/client-side/svnmerge.py:
  Fix a grammar mistake.
  Reformat some lines to fit in 80 characters.

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