##// END OF EJS Templates
simplemerge: split out function for rendering :merge3 conflict markers...
simplemerge: split out function for rendering :merge3 conflict markers The results in some duplicate, but the code is very straight-forward and I think it's worth it to have each conflict marker style in a separate function. Differential Revision: https://phab.mercurial-scm.org/D11978

File last commit:

r21874:8da01b6e default
r49393:e8f1414c default
Show More
README.md
4 lines | 80 B | text/x-minidsrc | MarkdownLexer
anatoly techtonik
contrib/vagrant: use Vagrant for running tests on virtual machine...
r21874 Run Mercurial tests with Vagrant:
$ vagrant up
$ vagrant ssh -c ./run-tests.sh