tests/test-merge5.out
author Simon Heimberg <simohe@besonet.ch>
Fri, 07 Aug 2009 15:40:51 +0200
changeset 9396 5cd14e1e8385
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
test-casefolding: fix wrong case on hfs on linux on linux hfs keeps the old case of the file stored force it by renameing to another name and back

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')