Mercurial > hg
diff tests/test-merge1.t @ 34553:0217d66846f7
merge: improve error messages for path conflicts during update
Differential Revision: https://phab.mercurial-scm.org/D782
| author | Mark Thomas <mbthomas@fb.com> |
|---|---|
| date | Mon, 02 Oct 2017 14:05:30 -0700 |
| parents | 33c8a6837181 |
| children | 2a774cae3a03 |
line wrap: on
line diff
--- a/tests/test-merge1.t Mon Oct 02 14:05:30 2017 -0700 +++ b/tests/test-merge1.t Mon Oct 02 14:05:30 2017 -0700 @@ -30,7 +30,7 @@ $ mkdir b && touch b/nonempty $ hg up - b: untracked file differs + b: untracked directory conflicts with file abort: untracked files in working directory differ from files in requested revision [255] $ hg ci