tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Thu, 28 May 2009 17:44:57 +0200
changeset 8649 2c097e22492c
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
clone: fall back to pull source repo cannot be locked, 937ee88da3ef was a noop 937ee88da3ef was a noop, it was missing the wait keyword

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