Mercurial > hg-stable
diff tests/test-commit-unresolved.t @ 45931: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 | 527ce85c2e60 |
children |
line wrap: on
line diff
--- a/tests/test-commit-unresolved.t Mon Nov 23 16:20:02 2020 -0800 +++ b/tests/test-commit-unresolved.t Mon Nov 23 16:48:13 2020 -0800 @@ -101,7 +101,7 @@ $ echo "ABCD" > A $ hg commit -m "Merged" abort: unresolved merge conflicts (see 'hg help resolve') - [255] + [20] Mark the conflict as resolved and commit @@ -123,7 +123,7 @@ $ hg rm --force A $ hg commit -m merged abort: unresolved merge conflicts (see 'hg help resolve') - [255] + [20] $ hg resolve -ma (no more unresolved files)