* 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.

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