Mercurial > hg
view tests/test-merge5.out @ 7640:7197812e8d44
error: move lock errors
rename LockException to LockError
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 12 Jan 2009 11:09:14 -0600 |
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')