Mercurial > hg
view tests/test-merge5.out @ 6616:e9dfe4e3ee6f
hgk: difftree must match all files when supplied list is empty
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 18 May 2008 23:31:54 +0200 |
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')