* subversion/libsvn_wc/update_editor.c   (close_file): Remove use of an svn_wc_entry_t.   (merge_file): Remove entry parameter, get entry inside the function.
* subversion/libsvn_wc/update_editor.c
  (close_file): Remove use of an svn_wc_entry_t.
  (merge_file): Remove entry parameter, get entry inside the function.

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