Show node kinds in human-readable tree conflict description string.

This clarifies what an 'edit' action refers to (a file vs. a dir).
It also makes it easier to spot mistakes where Subversion records
the wrong node kind information.

* subversion/svn/tree-conflicts.c
  (svn_cl__get_human_readable_tree_conflict_description): Show the
   node kinds involved in the tree conflict.

* subversion/tests/cmdline/info_tests.py
  (info_with_tree_conflicts): Adjust test expectations.

* subversion/tests/cmdline/stat_tests.py
  (status_with_tree_conflicts): Adjust test expectations.

* subversion/tests/cmdline/switch_tests.py
  (obstructed_switch, forced_switch_failures,
   tree_conflicts_on_switch_1_1, tree_conflicts_on_switch_1_2,
   tree_conflicts_on_switch_2_1, tree_conflicts_on_switch_2_2,
   tree_conflicts_on_switch_3): Adjust test expectations.

* subversion/tests/cmdline/tree_conflict_tests.py
  (actual_only_node_behaviour): Adjust test expectations.

* subversion/tests/cmdline/update_tests.py
  (tree_conflicts_on_update_1_1, tree_conflicts_on_update_1_2,
   tree_conflicts_on_update_2_1, tree_conflicts_on_update_2_2,
   tree_conflicts_on_update_3): Adjust test expectations.


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