Mercurial > hg

diff tests/test-merge4.t @ 43486:3b581ad59459

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 63c817ea4a70
children 8561ad49915d
line wrap: on
line diff