Mercurial > hg

view tests/test-merge5.out @ 11709:3e561b6af810 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: clarify the fact that qimport is trying to read a file "hg qimport tip" would throw "abort: unable to read tip" before this.
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Sat, 31 Jul 2010 10:50:29 +0900
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