Mercurial > hg
view tests/test-merge5.out @ 9672:5bbf4f130684
churn: fix --progress (broken by f3d60543924f)
author | Alexander Solovyov <piranha@piranha.org.ua> |
---|---|
date | Fri, 30 Oct 2009 15:43:01 +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')