Display locals path in conflict descriptions relative to the working copy's root directory, rather than as absolute paths.
Display locals path in conflict descriptions relative to the working copy's
root directory, rather than as absolute paths.

* subversion/svn/conflict-callbacks.c
  (describe_local_change): Get the working copy root path and show paths
   contained within the working copy as relative to the root, where applicable.


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

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