equal
deleted
inserted
replaced
1 + hg init |
|
2 + hg add a |
|
3 + hg commit -m ancestor -d 0 0 |
|
4 + hg commit -m branch1 -d 0 0 |
|
5 + hg co 0 |
|
6 + hg commit -m branch2 -d 0 0 |
|
7 + hg up -m 1 |
|
8 merge: warning: conflicts during merge |
1 merge: warning: conflicts during merge |
9 merging a |
2 merging a |
10 merging a failed! |
3 merging a failed! |
11 + hg id |
|
12 32e80765d7fe+75234512624c+ tip |
4 32e80765d7fe+75234512624c+ tip |
13 something else |
5 something else |
14 ======= |
6 ======= |
15 something |
7 something |
16 + hg status |
|
17 M a |
8 M a |