view tests/test-simplemerge.py.out @ 36930:36de8a3c429c

rebase: use configoverride context manager for ui.forcemerge Differential Revision: https://phab.mercurial-scm.org/D2761
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 09 Mar 2018 12:48:00 -0800
parents f18830651811
children
line wrap: on
line source

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

OK