Fix problem in r942906.
Fix problem in r942906.

* subversion/libsvn_wc/update_editor.c:
  (merge_file): fix params to build_record_fileinfo()

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