Follow-up to r39561:
Follow-up to r39561:

* subversion/libsvn_client/merge.c
  (tree_conflict_on_add): We can simply use "SVN_ERR()" here instead of
    "return svn_error_return()".
  (merge_file_added): Fix type of 'existing_conflict' variable. Didn't see
    the warning in the sea of deprecation warnings.


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

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