Mercurial > hg-stable

view tests/README @ 38498:d4be8ea8f22d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add a 'keepconflictparent' argument to graft Before this change, `merge.graft` was always dropping the "grafted" changeset from the parent. This is impractical in case of conflict as the second parent can be useful to help with conflict resolution. We add a new boolean parameter to control this behavior. This will make using `merge.graft` directly in shelve practicable. Differential Revision: https://phab.mercurial-scm.org/D3692
author Boris Feld <boris.feld@octobus.net>
date Tue, 29 May 2018 00:26:20 +0200
parents 4b0fc75f9403
children
line wrap: on
line source

To run the tests, do:

cd tests/
python run-tests.py

See https://mercurial-scm.org/wiki/WritingTests for
more information on writing tests.