Mercurial > hg
view tests/test-merge5.out @ 8941:37a9d551346c
addremove: drop some silly variable assignments
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 23 Jun 2009 17:51:51 -0500 |
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')