view tests/test-merge-force.out @ 6675:03a836ca6fde

Add a folding() method to dirstate The method returns True if the dirstate is on a case folding filesystem.
author Paul Moore <p.f.moore@gmail.com>
date Fri, 06 Jun 2008 08:29:16 +0100
parents 4b0c9c674707
children 3682a19bb637
line wrap: on
line source

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted changes
resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should show a as removed
R a
% manifest. should not have a:
b