Follow-up to r30913: mention conflict --accept options in 'svn help resolve'.
Follow-up to r30913: mention conflict --accept options in 'svn help
resolve'.

* subversion/svn/main.c
  (svn_cl__cmd_table): Add mine-conflict and theirs-conflict to 'svn
   help resolve'.


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

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