Mercurial > hg
diff tests/test-merge-halt.t @ 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 | 05535d0dea68 |
children | dc5e5577af39 |