equal
deleted
inserted
replaced
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 created new head |
|
4 % should abort |
4 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes |
5 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes |
|
6 % should succeed |
|
7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |