Mercurial > hg

view tests/test-merge5.out @ 9811:c92ac5a56f69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
buildrpm: enable to start the script from anywhere Previously the script worked only from the hg root.
author Gilles Moris <gilles.moris@free.fr>
date Fri, 06 Nov 2009 09:35:38 +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