Mercurial > hg-stable

comparison 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
comparison
equal deleted inserted replaced
16279:531e69ff348f 16284:2b0a406d3043
64 64
65 $ hg up -r null 65 $ hg up -r null
66 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 66 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
67 $ echo gold > a 67 $ echo gold > a
68 $ hg up 68 $ hg up
69 a: untracked file differs 69 A: untracked file differs
70 abort: untracked files in working directory differ from files in requested revision 70 abort: untracked files in working directory differ from files in requested revision
71 [255] 71 [255]
72 $ cat a 72 $ cat a
73 gold 73 gold
74 74