changeset 6336 | 4b0c9c674707 |
parent 3592 | fffc8a733bf9 |
child 6350 | 6aa4a3fa4e60 |
6335:e29557d687c9 | 6336:4b0c9c674707 |
---|---|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2 removing b |
2 removing b |
3 created new head |
|
3 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes |
4 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes |