diff tests/test-merge-default.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 8197b395710e
children 8caec25f5d8f
line wrap: on
line diff