Mercurial > hg
view tests/test-merge5.out @ 3819:6099cfa7c4aa
Merge with mpm
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Wed, 06 Dec 2006 13:51:54 -0800 |
parents | fffc8a733bf9 |
children | 4b0c9c674707 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes