# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1642801728 28800
# Node ID 47b3fca301f83b4c82ea99a696e283fd5baef460
# Parent  bcc4820242cfedd290468a6b7f193b860ffee208
graft: attempt to make merge labels more helpful

Differential Revision: https://phab.mercurial-scm.org/D12025

diff -r bcc4820242cf -r 47b3fca301f8 mercurial/commands.py
--- a/mercurial/commands.py	Fri Jan 21 13:49:11 2022 -0800
+++ b/mercurial/commands.py	Fri Jan 21 13:48:48 2022 -0800
@@ -3309,7 +3309,9 @@
             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