##// END OF EJS Templates
graft: attempt to make merge labels more helpful...
Martin von Zweigbergk -
r49439:47b3fca3 default
parent child Browse files
Show More
@@ -3309,7 +3309,9 b' def _dograft(ui, repo, *revs, **opts):'
3309 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
3309 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
3310 base = ctx.p1() if basectx is None else basectx
3310 base = ctx.p1() if basectx is None else basectx
3311 with ui.configoverride(overrides, b'graft'):
3311 with ui.configoverride(overrides, b'graft'):
3312 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3312 stats = mergemod.graft(
3313 repo, ctx, base, [b'local', b'graft', b'parent of graft']
3314 )
3313 # report any conflicts
3315 # report any conflicts
3314 if stats.unresolvedcount > 0:
3316 if stats.unresolvedcount > 0:
3315 # write out state for --continue
3317 # write out state for --continue
General Comments 0
You need to be logged in to leave comments. Login now