* subversion/libsvn_wc/merge.c   (merge_text_file): Don't leak temporary file RESULT_TARGET.    E.g. when a text conflict happened during an update, and the user    chose 'theirs-full', a file containing the diff3 merge result with    conflict markers was left over in .svn/tmp/ directory.
* subversion/libsvn_wc/merge.c
  (merge_text_file): Don't leak temporary file RESULT_TARGET.
   E.g. when a text conflict happened during an update, and the user
   chose 'theirs-full', a file containing the diff3 merge result with
   conflict markers was left over in .svn/tmp/ directory.

Found by: someone on the #svn IRC channel, some time ago


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

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