Fix an error leak.
Fix an error leak.

* subversion/libsvn_client/merge.c
  (do_file_merge): Delay the creation of the conflict error returned
    in the multi-pass, single-file, conflict-in-an-early-pass case (to
    avoid leaking said error if subsequent steps fail).

Found by: glasser

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