diff tests/test-topic-merge.t @ 5710:f65b2a978a1e stable

tests: make sure test-prev-next.t hits lock warning timeout every time The test case explicitly uses fake-editor.sh with sleep 5 to test that hg prev and hg next both lock working directory properly. But recent upstream tweak in run-tests.py sets this timeout to 15, which is too high for this test. Let's set it back to its default value of 0.
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 08 Dec 2020 11:58:34 +0800
parents 3946ee4ee3ae
children 55fbf9c8bfe0
line wrap: on
line diff