Remove redundant code.
Remove redundant code.

* subversion/libsvn_wc/update_editor.c
  (merge_file, merge_props): Don't allow content_state, prop_state or
  lock_state to be NULL, since our one and only caller always passes non-NULL
  values.

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