Mercurial > hg

view tests/test-simplemerge.py.out @ 21763:84cd5ee787ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: hold iolock across diff/prompt when interactive Otherwise diff may get separated from the corresponding prompt by other threads. This required moving the interactive prompting from one helper method to another.
author Matt Mackall <mpm@selenic.com>
date Wed, 18 Jun 2014 20:51:49 -0500
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK