As a companion to r19068, replace the "_" characters in "opts" with "-" for consistency with long flag names specified on the command-line.
As a companion to r19068, replace the "_" characters in "opts" with
"-" for consistency with long flag names specified on the
command-line.

* contrib/client-side/svnmerge.py
  Throughout, replace "_" with "-" in the "opts" dictionary element
  names "head_url", "merged_revs", and "head_path".


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

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