diff tests/sslcerts/pub-not-yet.pem @ 44377:8561ad49915d

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
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 29 Jan 2020 11:30:35 -0800
parents 9d02bed8477b
children
line wrap: on
line diff