Reapply a heavily tweaked version of sbutler's patch that made svn_wc_delete4clean up conflict marker files of deleted nodes.Compared to the original patch in r1132834: Don't use a helper function thatreimplements passing TRUE for svn_io_remove_file2's ignore_enoent. Avoiderror leaks. Perform the in-db deletion before removing the marker files.* subversion/libsvn_wc/adm_ops.c (svn_wc_delete4): Check for conflicts and remove conflict marker files. Rename argument to scratch_pool.