In certain conditions, the merge process was not removing its temp files.
In certain conditions, the merge process was not removing its temp files.

* subversion/libsvn_wc/merge.c:
  (eval_conflict_func_result): remove temp files for theirs/mine-conflict

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