# HG changeset patch # User Martin von Zweigbergk # Date 2022-01-21 21:48:48 # Node ID 47b3fca301f83b4c82ea99a696e283fd5baef460 # Parent bcc4820242cfedd290468a6b7f193b860ffee208 graft: attempt to make merge labels more helpful Differential Revision: https://phab.mercurial-scm.org/D12025 diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -3309,7 +3309,9 @@ def _dograft(ui, repo, *revs, **opts): overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')} base = ctx.p1() if basectx is None else basectx with ui.configoverride(overrides, b'graft'): - stats = mergemod.graft(repo, ctx, base, [b'local', b'graft']) + stats = mergemod.graft( + repo, ctx, base, [b'local', b'graft', b'parent of graft'] + ) # report any conflicts if stats.unresolvedcount > 0: # write out state for --continue