* subversion/svn/conflict-callbacks.c                                              (svn_cl__conflict_handler): Add error message when trying to launch                an external merge tool for a property conflict.                                                                                                               Patch by: Daniel Näslund <daniel{_AT_}longitudo.com>                             (error message tweaked by me)
* subversion/svn/conflict-callbacks.c                                           
  (svn_cl__conflict_handler): Add error message when trying to launch           
    an external merge tool for a property conflict.                             
                                                                                
Patch by: Daniel Näslund <daniel{_AT_}longitudo.com>                            
(error message tweaked by me)


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

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