diff mercurial/dirstate.py @ 43486:3b581ad59459

simplemerge: disable a pytype error where it's just confused Differential Revision: https://phab.mercurial-scm.org/D7287
author Augie Fackler <augie@google.com>
date Wed, 06 Nov 2019 15:42:30 -0500
parents ab9b0a20b9e6
children 313e3a279828
line wrap: on
line diff