* subversion/svn/conflict-callbacks.c   (launch_resolver): Suggest trying the "(m) merge" option if an error ocurred     while launching an external merge tool.
* subversion/svn/conflict-callbacks.c
  (launch_resolver): Suggest trying the "(m) merge" option if an error ocurred
    while launching an external merge tool.

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