Mercurial > hg

view tests/test-merge5.out @ 7592:75ad51257c82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert/gnuarch: recode cat-log parts to utf-8 to be hg.description friendly
author Edouard Gomez <ed.gomez@free.fr>
date Sun, 04 Jan 2009 18:44:39 +0100
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')