comparison mercurial/mergeutil.py @ 44212:cb8b67016110

graft: default `base` argument to common case of `ctx.p1()` I also updated the callers that wanted that, partly to simplify and partly to show that it works. Differential Revision: https://phab.mercurial-scm.org/D8027
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 28 Jan 2020 14:53:23 -0800
parents 8ff1ecfadcd1
children 32ce4cbaec4b
comparison
equal deleted inserted replaced
44211:fc7175df6359 44212:cb8b67016110