changeset 44178 | bd4f666b55a7 |
parent 44177 | 1850066f9e36 |
child 44179 | 293cab97a766 |
--- a/mercurial/commands.py Fri Jan 24 17:49:21 2020 -0800 +++ b/mercurial/commands.py Fri Jan 24 16:07:42 2020 -0800 @@ -4897,11 +4897,7 @@ force = opts.get(b'force') labels = [b'working copy', b'merge rev'] return hg.merge( - repo, - node, - force=force, - mergeforce=force, - labels=labels, + repo, node, force=force, mergeforce=force, labels=labels )