Mercurial > hg-stable
view tests/test-merge5.out @ 7070:2627ef59195d
churn and stats commands merged
author | Alexander Solovyov <piranha@piranha.org.ua> |
---|---|
date | Thu, 09 Oct 2008 00:14:20 +0300 |
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')