Mercurial > public > mercurial-scm > hg-stable
diff tests/test-largefiles.t @ 46486:dc00324e80f4
errors: use StateError more in merge module
Differential Revision: https://phab.mercurial-scm.org/D9912
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 29 Jan 2021 15:56:08 -0800 |
| parents | 95c4cca641f6 |
| children | e1953a34c110 |
line wrap: on
line diff
--- a/tests/test-largefiles.t Fri Jan 29 12:16:55 2021 -0800 +++ b/tests/test-largefiles.t Fri Jan 29 15:56:08 2021 -0800 @@ -1751,7 +1751,7 @@ $ hg rm sub2/large6 $ hg up -r. abort: outstanding uncommitted merge - [255] + [20] - revert should be able to revert files introduced in a pending merge $ hg revert --all -r .