Ensure that descriptions of the local change involved in a conflict mention the words "working copy". This makes these descriptions sound less ambiguous.
Ensure that descriptions of the local change involved in a conflict mention
the words "working copy". This makes these descriptions sound less ambiguous.

* subversion/svn/conflict-callbacks.c
  (describe_local_change): Add "working copy" to sentences.


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

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