Mercurial > hg

view tests/test-merge5.out @ 7959:5fb6edbf0ab8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: guess lexer by filename for recent pygments Recent pygments guess AntlrJavaLexer for the isolatin text, converted to ascii by util.tolocal, which yields class="err". Guess lexer by extension instead.
author Christian Ebert <blacktrash@gmx.net>
date Sat, 04 Apr 2009 15:14:36 +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')