equal
deleted
inserted
replaced
|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1 merge: warning: conflicts during merge |
2 merge: warning: conflicts during merge |
2 merging a |
3 merging a |
3 merging a failed! |
4 merging a failed! |
|
5 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
6 There are unresolved merges, you can redo the full merge using: |
|
7 hg update -C 2 |
|
8 hg merge 1 |
4 e7fe8eb3e180+0d24b7662d3e+ tip |
9 e7fe8eb3e180+0d24b7662d3e+ tip |
5 something else |
10 something else |
6 ======= |
11 ======= |
7 something |
12 something |
8 M a |
13 M a |