equal
deleted
inserted
replaced
1 + hg init |
|
2 + hg add a b |
|
3 + hg commit -m commit #0 -d 0 0 |
|
4 + hg commit -mcomment #1 -d 0 0 |
|
5 + hg update 0 |
|
6 + hg commit -A -mcomment #2 -d 0 0 |
|
7 removing b |
1 removing b |
8 + hg update 1 |
|
9 this update spans a branch affecting the following files: |
2 this update spans a branch affecting the following files: |
10 b |
3 b |
11 aborting update spanning branches! |
4 aborting update spanning branches! |
12 (use update -m to merge across branches or -C to lose changes) |
5 (use update -m to merge across branches or -C to lose changes) |