Mercurial > hg

view tests/test-merge5.out @ 11701:84fb29f5e0d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: fix qimport --name --existing --force on win32 os.rename() does not overwrite existing targets on Windows.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 28 Jul 2010 11:07:20 +0200
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