* subversion/libsvn_client/resolved.c   (resolve_conflict): Plug an error leak.
* subversion/libsvn_client/resolved.c
  (resolve_conflict): Plug an error leak.


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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion