Mercurial > hg-stable

comparison mercurial/merge.py @ 43524:949b4d545c90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
color: suppress pytype warning on a windows-only module Differential Revision: https://phab.mercurial-scm.org/D7274
author Augie Fackler <augie@google.com>
date Wed, 06 Nov 2019 14:48:22 -0500
parents 8ff1ecfadcd1
children be384a2052aa
comparison
equal deleted inserted replaced
43523:9ce76155e0da 43524:949b4d545c90