* subversion/libsvn_wc/wc_db_update_move.c
  (check_tree_conflict): Adjust both kinds when moving to parent.


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