Mercurial > hg > mercurial-crew

view tests/test-merge5.out @ 9731:0e080d519d1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: treat rev as raw-rev if user agent is hg
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 06 Nov 2009 22:46:46 +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