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

Antoine Pitrou solipsis at pitrou.net
Thu May 15 06:33:57 CDT 2014


On Mon, 12 May 2014 17:47:36 -0700
Durham Goode <durham at fb.com> wrote:
> # HG changeset patch
> # User Durham Goode <durham at fb.com>
> # Date 1399684151 25200
> #      Fri May 09 18:09:11 2014 -0700
> # Node ID 2ca6a41546b166ca491537d85729fc3e9c42c01b
> # Parent  3e64ef576f5da47348903d25727d5e7c6c6a046a
> update: specify custom conflict markers for update (BC)
> 
> Add custom conflict markers 'working copy' and 'destination' for doing hg update
> when there are conflicts between your working copy and the destination.

I find the term "destination" confusing in that context. Why not
"repository"?

Regards

Antoine.




More information about the Mercurial-devel mailing list