Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: attempt to make merge labels more helpful
authorMartin von Zweigbergk <martinvonz@google.com>
Fri, 21 Jan 2022 13:48:48 -0800
changeset 48593 47b3fca301f8
parent 48592 bcc4820242cf
child 48594 b128d21cbe8b
graft: attempt to make merge labels more helpful Differential Revision: https://phab.mercurial-scm.org/D12025
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial