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".