Mercurial > hg-stable
changeset 48615:47b3fca301f8
graft: attempt to make merge labels more helpful
Differential Revision: https://phab.mercurial-scm.org/D12025
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 21 Jan 2022 13:48:48 -0800 |
| parents | bcc4820242cf |
| children | b128d21cbe8b |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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