Mercurial > hg

view tests/test-merge5.out @ 9484:c96d73dd956d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gendoc: do not wrap encoded string - it breaks multi-byte characters - it is not needed since Docutils will take care of wrapping the strings as necessary
author Martin Geisler <mg@lazybytes.net>
date Sun, 27 Sep 2009 10:04:51 +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')