* trunk/contrib/client-side/svnmerge:   - Fix bug in r12924: we changed the -H flag to -S but forgot to update     the string passed to getopt(1) accordingly.
* trunk/contrib/client-side/svnmerge:
  - Fix bug in r12924: we changed the -H flag to -S but forgot to update
    the string passed to getopt(1) accordingly.


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

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