Mercurial > hg

comparison tests/test-simplemerge.py @ 36177:187f2474bc11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: coerce nodes to bytes, not str Differential Revision: https://phab.mercurial-scm.org/D2250
author Augie Fackler <augie@google.com>
date Tue, 13 Feb 2018 23:37:58 -0500
parents 68c43a416585
children f0b6fbea00cf
comparison
equal deleted inserted replaced
36176:0836c70ba5fa 36177:187f2474bc11