Mercurial > public > mercurial-scm > hg

diff tests/test-pathconflicts-basic.t @ 34553:0217d66846f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 989e884d1be9
line wrap: on
line diff
--- a/tests/test-pathconflicts-basic.t	Mon Oct 02 14:05:30 2017 -0700
+++ b/tests/test-pathconflicts-basic.t	Mon Oct 02 14:05:30 2017 -0700
@@ -37,7 +37,7 @@
   $ mkdir a
   $ echo 3 > a/b
   $ hg up file
-  a: untracked file differs
+  a: untracked directory conflicts with file
   abort: untracked files in working directory differ from files in requested revision
   [255]
   $ hg up --clean file