equal
deleted
inserted
replaced
3 adding quux1 |
3 adding quux1 |
4 adding quux2 |
4 adding quux2 |
5 merging bar |
5 merging bar |
6 merging bar failed! |
6 merging bar failed! |
7 merging foo and baz |
7 merging foo and baz |
8 merging foo failed! |
8 merging baz failed! |
9 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
9 1 files updated, 0 files merged, 0 files removed, 2 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 |