Complete r19072 (also a companion to r19068), replacing the "_" characters in "opts" with "-" for consistency with long flag names specified on the command-line.
Complete r19072 (also a companion to r19068), replacing the "_"
characters in "opts" with "-" for consistency with long flag names
specified on the command-line.

* contrib/client-side/svnmerge.py
  In "default_opts", and in "opts" throughout, replace "_" with "-" in
  dictionary element names "block_prop" and "commit_verbose".


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

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