Mercurial > hg

view tests/test-merge5.out @ 10323:0aa59f532ef9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
record: function variable naming & signature cleanup. No functionality change. All tests pass.
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Fri, 05 Feb 2010 18:46:22 +0100
parents 68a1b9d0663e
children
line wrap: on
line source

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