Mercurial > public > mercurial-scm > hg
diff mercurial/hg.py @ 21537:1ab30e9ba0fc
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.
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Fri, 09 May 2014 18:09:11 -0700 |
| parents | 1004d3cd65fd |
| children | 219af1521a6a |
line wrap: on
line diff
--- a/mercurial/hg.py Fri May 09 16:13:14 2014 -0700 +++ b/mercurial/hg.py Fri May 09 18:09:11 2014 -0700 @@ -483,7 +483,8 @@ When overwrite is set, changes are clobbered, merged else returns stats (see pydoc mercurial.merge.applyupdates)""" - return mergemod.update(repo, node, False, overwrite, None) + return mergemod.update(repo, node, False, overwrite, None, + labels=['working copy', 'destination']) def update(repo, node): """update the working directory to node, merging linear changes"""