Mercurial > hg

view tests/test-merge5.out @ 9131:2bbb8419720d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
win32mbcs: wrapper supports keyword arguments and dict result. The keyword arguments are also decoded before calling original. And dict of return value is also encoded back.
author Shun-ichi GOTO <shunichi.goto@gmail.com>
date Fri, 10 Jul 2009 15:52:01 +0900
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')