Mercurial > hg
view tests/README @ 27125:969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
In upcoming patches we're going to move change/delete conflicts to the resolve
phase -- it will be important to see how regular conflicts interact with
change/delete ones.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Mon, 23 Nov 2015 13:43:14 -0800 |
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.