Mercurial > public > mercurial-scm > python-hglib

comparison tests/test-pull.py @ 173:8c4d24b58c23 2.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: adjust test-merge for mercurial 3.7 As of changeset 88d5db4b155c, the noninteractive handler for merge leaves conflicting files unresolved.
author Julien Cristau <julien.cristau@logilab.fr>
date Fri, 19 Feb 2016 19:16:30 +0100
parents c1b966866ed7
children
comparison
equal deleted inserted replaced
172:028f66e8e3ca 173:8c4d24b58c23