mercurial/cext/__init__.py
author Martin von Zweigbergk <martinvonz@google.com>
Mon, 29 Nov 2021 23:00:29 -0800
changeset 48470 9e1f174d305b
parent 32251 c48583859e04
permissions -rw-r--r--
simplemerge: set `conflicts` earlier for :union tool Differential Revision: https://phab.mercurial-scm.org/D11853