equal
deleted
inserted
replaced
3 adding quux1 |
3 adding quux1 |
4 adding quux2 |
4 adding quux2 |
5 created new head |
5 created new head |
6 merging bar |
6 merging bar |
7 merging bar failed! |
7 merging bar failed! |
8 merging foo and baz |
8 merging foo and baz to baz |
9 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
9 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
10 There are unresolved merges, you can redo the full merge using: |
10 There are unresolved merges, you can redo the full merge using: |
11 hg update -C 2 |
11 hg update -C 2 |
12 hg merge 1 |
12 hg merge 1 |
13 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
13 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
14 merging bar |
14 merging bar |
15 merging bar failed! |
15 merging bar failed! |
16 merging baz and foo |
16 merging baz and foo to baz |
17 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
17 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
18 There are unresolved merges, you can redo the full merge using: |
18 There are unresolved merges, you can redo the full merge using: |
19 hg update -C 1 |
19 hg update -C 1 |
20 hg merge 2 |
20 hg merge 2 |