HomePhabricator

revset: add a revset for parents in merge state

Authored by martinvonz.

Description

revset: add a revset for parents in merge state

This may be particularly useful soon, when I'm going to change how `hg
rebase` sets its parents during conflict resolution.

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

Details

Committed
martinvonzWed, Jan 29, 2:30 PM
Differential Revision
D8041: revset: add a revset for parents in merge state
Parents
rHG7f7c8521e9bd: tests: add test of rebase with conflict in merge commit
Branches
Unknown
Tags
Unknown