Address some node-kind related ### comments in the move-update code.

* subversion/libsvn_wc/wc_db_update_move.c
  (create_conflict_markers): Record node kind information for the "new
   version" of the conflicted node. Record the local disk kind and copy
   all other information from existing new node_version data.
  (tc_editor_alter_directory, update_working_file): Pass the local node
   kind to create_conflict_markers().


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1440584 13f79535-47bb-0310-9956-ffa450edef68