diff mercurial/simplemerge.py @ 48694:5c940f9ba3e4

dagop: don't import nullrev from .node twice See 59fa3890d40a. Differential Revision: https://phab.mercurial-scm.org/D12120
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 31 Jan 2022 18:04:11 +0300
parents 3c8cc987672e
children 9ee70e175fed
line wrap: on
line diff