* subversion/libsvn_wc/update_editor.c   (merge_file): Remove two unused parameters.   (close_file): Adjust caller.
* subversion/libsvn_wc/update_editor.c
  (merge_file): Remove two unused parameters.
  (close_file): Adjust caller.

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