* subversion/svn/conflict-callbacks.c   (svn_cl__interactive_conflict_handler): Command name should be (r)esolved,    as in 'svn resolved', not (r)esolve.
* subversion/svn/conflict-callbacks.c
  (svn_cl__interactive_conflict_handler): Command name should be (r)esolved,
   as in 'svn resolved', not (r)esolve.

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