Mercurial > hg
view tests/test-merge5.out @ 11843:00f8e7837668 stable
rebase: recompute the set of skipped rev when using --continue (issue2330)
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 13 Aug 2010 18:02:02 +0200 |
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