Mercurial > public > mercurial-scm > hg
diff tests/test-pathconflicts-basic.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 | 0b46e1aa7760 |
| children |
line wrap: on
line diff
--- a/tests/test-pathconflicts-basic.t Fri Jan 29 12:16:55 2021 -0800 +++ b/tests/test-pathconflicts-basic.t Fri Jan 29 15:56:08 2021 -0800 @@ -53,7 +53,7 @@ $ hg up file a: untracked directory conflicts with file abort: untracked files in working directory differ from files in requested revision - [255] + [20] $ hg up --clean file 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (activating bookmark file)