changeset 2830 | 49988d9f0758 |
parent 2175 | b2ae81a7df29 |
child 3580 | 41989e55fa37 |
2829:4870f795f681 | 2830:49988d9f0758 |
---|---|
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 this update spans a branch affecting the following files: |
3 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes |
4 b |
|
5 aborting update spanning branches! |
|
6 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes) |