* contrib/client-side/svnmerge.py:   Fix a typo.
* contrib/client-side/svnmerge.py:
  Fix a typo.

Patch by: Hyrum Wright <hyrum_wright@mail.utexas.edu>


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

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