Mercurial > hg

changeset 19498:3ac1735a2265 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: glob out exception type for directory collision Got three different results on buildbot.
author Matt Mackall <mpm@selenic.com>
date Thu, 25 Jul 2013 02:44:27 -0500
parents e012a20061ed
children 81318ca090a2
files tests/test-merge1.t
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-merge1.t	Thu Jul 25 02:34:09 2013 -0500
+++ b/tests/test-merge1.t	Thu Jul 25 02:44:27 2013 -0500
@@ -28,7 +28,7 @@
 
   $ mkdir b
   $ hg up
-  abort: Is a directory: '$TESTTMP/t/b'
+  abort: *: '$TESTTMP/t/b' (glob)
   [255]
   $ hg ci
   abort: last update was interrupted