view tests/test-casefolding.out @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.
author Augie Fackler <durin42@gmail.com>
date Wed, 04 Mar 2009 13:06:16 -0600
parents 03916abdfb64
children
line wrap: on
line source

% test file addition with bad case
adding a
A a
a
% test case collision on rename (issue 750)
adding a
a
committed changeset 0:07f4944404050f47db2e5c5071e0e84e7a27bba9
A: not overwriting - file exists
% test case collision between revisions (issue 912)
adding a
adding A
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 1 files removed, 0 files unresolved