tests/test-simplemerge.py.out
author Siddharth Agarwal <sid0@fb.com>
Mon, 05 Oct 2015 14:37:59 -0700
changeset 26491 366d489295ca
parent 22023 f18830651811
permissions -rw-r--r--
scmutil: add a way for a repo's wlock to be inherited by a subprocess This is part of a series that will allow locks to be inherited by subprocesses in limited circumstances. In the future, we'll call this for custom merge drivers.

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK