Mercurial Mercurial > hg-stable / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/README
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
Wed, 12 Aug 2015 08:53:01 -0400
changeset 26223 ed12abab068e
parent 8936 1de6e7e1bb9f
child 26421 4b0fc75f9403
permissions -rw-r--r--
simplemerge: enable option to resolve conflicts one way With this change, the simplemerge algorithm grows an option to only return the local or the other hunk in a conflicting region.

To run the tests, do:

cd tests/
python run-tests.py

See http://mercurial.selenic.com/wiki/WritingTests for
more information on writing tests.
hg-stable