tests/test-merge5.out
author Sune Foldager <cryo@cyanite.org>
Tue, 24 Nov 2009 09:49:23 +0100
changeset 9915 806e6b6cb8d8
parent 9717 68a1b9d0663e
permissions -rw-r--r--
ancestor: improve docstring The term "least common ancestor" is highly ambiguous.

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' to merge or use 'hg update -C' to discard changes)
% should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved