Mercurial > hg

view tests/test-merge5.out @ 7044:e51c0f41f271

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Escape '%' when writing to hgrc (issue1199) Fixes clone with paths containing '%'. Patch provided by mjc.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 20 Sep 2008 15:00:58 +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')