Mercurial > hg
diff tests/test-up-local-change.t @ 46418: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 | 69429972ff1f |
children | 38941a28406a |
line wrap: on
line diff
--- a/tests/test-up-local-change.t Fri Jan 29 12:16:55 2021 -0800 +++ b/tests/test-up-local-change.t Fri Jan 29 15:56:08 2021 -0800 @@ -175,7 +175,7 @@ $ hg up 1 b: untracked file differs abort: untracked files in working directory differ from files in requested revision - [255] + [20] $ rm b test conflicting untracked ignored file @@ -195,7 +195,7 @@ $ hg up 'desc("add ignored file")' ignored: untracked file differs abort: untracked files in working directory differ from files in requested revision - [255] + [20] test a local add