* subversion/libsvn_wc/update_editor.c
  (add_directory, add_file): When flagging a tree conflict, properly record
   the local node kind in the tree conflict description, instead of recording
   the node kind of the incoming change as the local kind.


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