diff tests/fsmonitor-run-tests.py @ 45916:fa87536d3d70

errors: raise StateError when there are unresolves merge conflicts Differential Revision: https://phab.mercurial-scm.org/D9392
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 23 Nov 2020 16:48:13 -0800
parents c102b704edb5
children 6000f5b25c9b
line wrap: on
line diff