Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 44253:bd4f666b55a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: drop now-unused "abort" argument from hg.merge() Differential Revision: https://phab.mercurial-scm.org/D7997
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 24 Jan 2020 16:07:42 -0800
parents 1850066f9e36
children 293cab97a766
comparison
equal deleted inserted replaced
44252:1850066f9e36 44253:bd4f666b55a7
4895 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} 4895 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4896 with ui.configoverride(overrides, b'merge'): 4896 with ui.configoverride(overrides, b'merge'):
4897 force = opts.get(b'force') 4897 force = opts.get(b'force')
4898 labels = [b'working copy', b'merge rev'] 4898 labels = [b'working copy', b'merge rev']
4899 return hg.merge( 4899 return hg.merge(
4900 repo, 4900 repo, node, force=force, mergeforce=force, labels=labels
4901 node,
4902 force=force,
4903 mergeforce=force,
4904 labels=labels,
4905 ) 4901 )
4906 4902
4907 4903
4908 statemod.addunfinished( 4904 statemod.addunfinished(
4909 b'merge', 4905 b'merge',