* 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.   (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.
  (close_file): Update caller.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1084971 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion