##// END OF EJS Templates
tests: use silenttestrunner in test-simplemerge.py...
tests: use silenttestrunner in test-simplemerge.py The time monkeypatching doesn't appear to work reliably in Python 3, possibly due to unittest using a different time function. This makes the test intermittent due to the execution time not always being `0.00s`. We have our own wrapper around unittest for more deterministic test output. So let's use it. As a bonus, all test output disappeared, so we can remove the .out file! Differential Revision: https://phab.mercurial-scm.org/D6921

File last commit:

r32568:4b9b8793 default
r43280:d75142ef default
Show More
editmergeps.bat
2 lines | 102 B | application/x-msdownload | BatchLexer
@echo off
powershell -NoProfile -ExecutionPolicy unrestricted -Command "& '%~dp0\editmergeps.ps1' %*"