Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 48590:7e503eff3c76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: set custom conflict label for base commit Differential Revision: https://phab.mercurial-scm.org/D12022
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 18 Jan 2022 13:23:49 -0800
parents b5f8d9e55d42
children 937998e43e93
comparison
equal deleted inserted replaced
48589:a51c522c0064 48590:7e503eff3c76
2278 return _update( 2278 return _update(
2279 ctx.repo(), 2279 ctx.repo(),
2280 ctx.rev(), 2280 ctx.rev(),
2281 branchmerge=False, 2281 branchmerge=False,
2282 force=False, 2282 force=False,
2283 labels=[b'working copy', b'destination'], 2283 labels=[b'working copy', b'destination', b'working copy parent'],
2284 updatecheck=updatecheck, 2284 updatecheck=updatecheck,
2285 wc=wc, 2285 wc=wc,
2286 ) 2286 )
2287 2287
2288 2288