Rename the 'node_kind' field in svn_wc_conflict_description3_t
to 'local_node_kind'.

No functional change.

* subversion/include/svn_wc.h
  (svn_wc_conflict_description3_t): Rename 'node_kind' to 'local_node_kind'.
   Resolve a question in a comment by explaining where kinds of other nodes
   involved in the conflict can be found.
  (svn_wc_conflict_description_create_tree3): Rename 'node_kind' parameter
   to 'local_node_kind'.

* subversion/libsvn_wc/info.c
  (svn_wc__get_info): Track rename.

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__serialize_conflict): Track rename.

* subversion/libsvn_wc/util.c
  (svn_wc_conflict_description_create_text3,
   svn_wc_conflict_description_create_prop3,
   svn_wc__cd3_to_cd2): Track rename.
  (svn_wc_conflict_description_create_tree3): Rename 'node_kind' parameter
   to 'local_node_kind'.

* subversion/tests/libsvn_wc/conflict-data-test.c
  (compare_conflict, test_deserialize_tree_conflict): Track rename.


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