* subversion/svn/file-merge.c   (svn_cl__merge_file): Do not operate directly on the file at merged_path,    but on a temporary file and rename that on top of the merged_path at the    end of the merge. This prevents the merge tool from truncating the file    at merged_path at the start of the merge, and potentially leaving the file    in a bad state if an error occurs mid-way.
* subversion/svn/file-merge.c
  (svn_cl__merge_file): Do not operate directly on the file at merged_path,
   but on a temporary file and rename that on top of the merged_path at the
   end of the merge. This prevents the merge tool from truncating the file
   at merged_path at the start of the merge, and potentially leaving the file
   in a bad state if an error occurs mid-way.

Suggested by: jcorvel

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion