equal
deleted
inserted
replaced
11 + rm b |
11 + rm b |
12 + hg commit -A '-tcomment #2' -d '0 0' -u user |
12 + hg commit -A '-tcomment #2' -d '0 0' -u user |
13 + yes k |
13 + yes k |
14 + hg update 1 |
14 + hg update 1 |
15 this update spans a branch affecting the following files: |
15 this update spans a branch affecting the following files: |
|
16 b |
16 aborting update spanning branches! |
17 aborting update spanning branches! |
17 (use update -m to perform a branch merge) |
18 (use update -m to perform a branch merge) |
18 + exit 0 |
19 + exit 0 |