* subversion/svn/conflict-callbacks.c   (handle_tree_conflict): Update conflict description if the user chooses    an alternative move target path.
* subversion/svn/conflict-callbacks.c
  (handle_tree_conflict): Update conflict description if the user chooses
   an alternative move target path.


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

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