Mercurial > hg
view tests/test-merge5.out @ 7425:14ed6662af48
tests: disable test-convert-darcs properly for darcs 2
The x bit was disabled without notice in 8046f0a070a6
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Sun, 23 Nov 2008 20:16:29 +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')