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.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@858691 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion