--- a/mercurial/mergestate.py Tue Mar 30 15:54:36 2021 -0700 +++ b/mercurial/mergestate.py Wed Mar 31 00:19:52 2021 +0200 @@ -10,7 +10,6 @@ bin, hex, nullhex, - nullid, nullrev, ) from . import (