Mercurial > hg
diff tests/helpers-testrepo.sh @ 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 | 152f1b47e0ad |
children | 813226b3b4ca 16574ca8b155 |