tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 20 May 2009 18:35:41 +0200
changeset 8530 03196ac9a8b9
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
store: refactor the fncache handling put all the fncache file writing and reading in the same place.

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')