Mercurial > hg

view tests/test-merge5.out @ 12393:84ceedcfeb6a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert/darcs: improve unsupported format detection (issue2172)
author Patrick Mezard <pmezard@gmail.com>
date Fri, 24 Sep 2010 00:04:07 +0200
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