equal
deleted
inserted
replaced
31 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
31 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
32 There are unresolved merges, you can redo the full merge using: |
32 There are unresolved merges, you can redo the full merge using: |
33 hg update -C 3 |
33 hg update -C 3 |
34 hg merge 4 |
34 hg merge 4 |
35 one |
35 one |
36 <<<<<<< |
36 <<<<<<< my |
37 two-point-five |
37 two-point-five |
38 ======= |
38 ======= |
39 two-point-one |
39 two-point-one |
40 >>>>>>> |
40 >>>>>>> other |
41 three |
41 three |
42 rev offset length base linkrev nodeid p1 p2 |
42 rev offset length base linkrev nodeid p1 p2 |
43 0 0 7 0 0 01365c4cca56 000000000000 000000000000 |
43 0 0 7 0 0 01365c4cca56 000000000000 000000000000 |
44 1 7 9 1 1 7b013192566a 01365c4cca56 000000000000 |
44 1 7 9 1 1 7b013192566a 01365c4cca56 000000000000 |
45 2 16 15 2 2 8fe46a3eb557 01365c4cca56 000000000000 |
45 2 16 15 2 2 8fe46a3eb557 01365c4cca56 000000000000 |