Mercurial > hg
diff tests/test-rename-dir-merge.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 | 17e12938f8e7 |
| children | ad30b29bc23d |
line wrap: on
line diff
--- a/tests/test-rename-dir-merge.t Fri Jan 29 12:16:55 2021 -0800 +++ b/tests/test-rename-dir-merge.t Fri Jan 29 15:56:08 2021 -0800 @@ -110,7 +110,7 @@ $ hg merge 2 b/c: untracked file differs abort: untracked files in working directory differ from files in requested revision - [255] + [20] $ cat b/c target but it should succeed if the content matches