Remove the use of an entry during conflict resolution.
Remove the use of an entry during conflict resolution.

* subversion/libsvn_wc/adm_ops.c
  (resolve_conflict_on_entry): Rename to...
  (resolve_conflict_on_node): ...this, use svn_wc__entry_modify2().
  (resolve_found_entry_callback): Don't provide an entry to
    resolve_conflict_on_entry().

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