* subversion/libsvn_wc/update_editor.c   (merge_file): Remove an argument which we already receive via the baton.     Don't retrieve the BASE information if we already have it. Don't check     a boolean which is always false in this part of an if block.   (close_file): Update caller.
* subversion/libsvn_wc/update_editor.c
  (merge_file): Remove an argument which we already receive via the baton.
    Don't retrieve the BASE information if we already have it. Don't check
    a boolean which is always false in this part of an if block.
  (close_file): Update caller.

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