Mercurial > hg

view tests/test-merge5.out @ 10565:461c2159937f stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n-ja: synchronized with bb4561401c84
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Tue, 02 Mar 2010 12:41:27 +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