Mercurial > public > mercurial-scm > hg

diff tests/test-casefolding.t @ 16284:2b0a406d3043

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix unknown file merge detection for case-folding systems This was triggering some test failures on Mac.
author Matt Mackall <mpm@selenic.com>
date Mon, 26 Mar 2012 16:41:54 -0500
parents 44fa047cef57
children 9952ac7e0968
line wrap: on
line diff
--- a/tests/test-casefolding.t	Thu Mar 22 17:08:05 2012 -0500
+++ b/tests/test-casefolding.t	Mon Mar 26 16:41:54 2012 -0500
@@ -66,7 +66,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo gold > a
   $ hg up
-  a: untracked file differs
+  A: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
   [255]
   $ cat a