When the command line client shows tree conflict information, be more
explicit about the fact that an incoming deletion might be part of an
incoming move, and that a missing target during a merge might have
been deleted or moved in the merge target's history. The current
wording is a common source of user confusion. I'm not really sure
if this change helps users a lot but we'll see.

If we ever grow support for incoming moves, we'll need to update
these descriptions again anyway.

* subversion/svn/cl-conflicts.c
  (local_reason_str): Add 'operation' parameter, and print
   print additional hints about possible causes if the
   operation is a merge.
  (incoming_action_str): Any incoming delete might be part of
   an incoming move, so say "incoming delete or move".

* subversion/tests/cmdline/stat_tests.py
  (status_with_tree_conflicts): Adjust expected output.

* subversion/tests/cmdline/switch_tests.py
  (tree_conflicts_on_switch_1_2,
   tree_conflicts_on_switch_2_1,
   tree_conflicts_on_switch_2_2,
   tree_conflicts_on_switch_3): Adjust expected output.

* subversion/tests/cmdline/update_tests.py
  (tree_conflicts_on_update_1_2,
   tree_conflicts_on_update_2_1,
   tree_conflicts_on_update_2_2,
   tree_conflicts_on_update_3): Adjust expected output.


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