[PATCH 4 of 5 V3] update: specify custom conflict markers for update (BC)

[Antoine Pitrou]

On Thu, 15 May 2014 23:31:06 -0700
Pierre-Yves David <pierre-yves.david at ens-lyon.org> wrote:
> 
> 
> On 05/15/2014 02:18 PM, Antoine Pitrou wrote:
> > On Thu, 15 May 2014 21:05:53 +0000
> > Durham Goode <durham at fb.com> wrote:
> >>
> >> I don¹t think normal users have a great understanding of the difference
> >> between the working copy and the repository.  Œdestination¹ at least
> >> differentiates itself from working copy in that the working copy is your
> >> files, and destination is where you¹re going, especially since this only
> >> shows up during an hg update.
> >
> > I'm not sure how someone can use hg without understanding the
> > difference between working copy and repository.
> 
> You will be very surprise about the very thin amount of knowledge of 
> average user.

But how can they make sense of the word "destination"?
At least "repository" is crystal clear and unambiguous for someone who
knows a minimum about hg.

Regards

Antoine.