Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 45794:330c258fe7ca
branching: merge with stable
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 29 Oct 2020 00:17:12 -0700 |
parents | 4db5671d57d9 e0ad11ab8052 |
children | 49535e56fab8 |
line wrap: on
line diff
--- a/mercurial/commands.py Sat Oct 17 21:57:21 2020 +0900 +++ b/mercurial/commands.py Thu Oct 29 00:17:12 2020 -0700 @@ -862,13 +862,11 @@ ui.status( _(b'changeset %s backs out changeset %s\n') - % (nice(repo.changelog.tip()), nice(node)) + % (nice(newnode), nice(node)) ) if opts.get(b'merge') and op1 != node: hg.clean(repo, op1, show_stats=False) - ui.status( - _(b'merging with changeset %s\n') % nice(repo.changelog.tip()) - ) + ui.status(_(b'merging with changeset %s\n') % nice(newnode)) overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} with ui.configoverride(overrides, b'backout'): return hg.merge(repo[b'tip'])