In the interactive conflict resolver, always describe the incoming change of a tree conflict using a full sentence. The local change is already described in this way, so now we're consistent.
In the interactive conflict resolver, always describe the incoming change
of a tree conflict using a full sentence. The local change is already
described in this way, so now we're consistent.

* subversion/libsvn_client/conflicts.c
  (incoming_action_str): Replaced with ...
  (describe_incoming_change): ... this new helper function.
  (conflict_tree_get_description_generic): Update caller.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1739730 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion