Correct error handling for property merges involving "svn:mergeinfo".
Correct error handling for property merges involving "svn:mergeinfo".

* subversion/libsvn_wc/props.c
  (svn_wc__merge_props): Wrap call to combine_forked_mergeinfo_props()
   in SVN_ERR() macro.


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

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