Include node-kind information in 'incoming edit' conflict desriptions.
Include node-kind information in 'incoming edit' conflict desriptions.

* subversion/libsvn_client/conflicts.c
  (describe_incoming_edit_upon_update,
   describe_incoming_edit_upon_switch): New helper functions.
  (conflict_tree_get_description_incoming_edit): Check node kind of the
   'incoming-new' node and add this information to the description.


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

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