Mercurial > hg
view tests/test-merge5.out @ 7812:18048153fd4e
test-convert-cvs*: mute output from "cvs up"
Apparently some versions of cvs outputs more than other versions. That is
however not relevant for these tests.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Fri, 27 Feb 2009 17:52:31 +0100 |
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')