Mercurial > hg
diff hgext/histedit.py @ 44212:cb8b67016110
graft: default `base` argument to common case of `ctx.p1()`
I also updated the callers that wanted that, partly to simplify and
partly to show that it works.
Differential Revision: https://phab.mercurial-scm.org/D8027
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 28 Jan 2020 14:53:23 -0800 |
parents | 801b8d314791 |
children | f546d2170b0f |
line wrap: on
line diff
--- a/hgext/histedit.py Fri Jan 10 13:12:24 2020 -0800 +++ b/hgext/histedit.py Tue Jan 28 14:53:23 2020 -0800 @@ -649,7 +649,7 @@ repo.ui.setconfig( b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit' ) - stats = mergemod.graft(repo, ctx, ctx.p1(), [b'local', b'histedit']) + stats = mergemod.graft(repo, ctx, labels=[b'local', b'histedit']) finally: repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit') return stats