Mercurial > hg

view tests/test-merge5.out @ 6868:93b03f1be289

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: Fix debugging output when running multiple commands with xargs.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 08 Aug 2008 18:37:50 +0200
parents 0b89315d5de2
children 68a1b9d0663e
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' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')