equal
deleted
inserted
replaced
97 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
97 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
98 [1] |
98 [1] |
99 |
99 |
100 $ cat test.txt |
100 $ cat test.txt |
101 one |
101 one |
102 <<<<<<< local: 50c3a7e29886 - test: Merge 1 |
102 <<<<<<< working copy: 50c3a7e29886 - test: Merge 1 |
103 two-point-five |
103 two-point-five |
104 ======= |
104 ======= |
105 two-point-one |
105 two-point-one |
106 >>>>>>> other: 40d11a4173a8 - test: two -> two-point-one |
106 >>>>>>> merge rev: 40d11a4173a8 - test: two -> two-point-one |
107 three |
107 three |
108 |
108 |
109 $ hg debugindex test.txt |
109 $ hg debugindex test.txt |
110 rev offset length ..... linkrev nodeid p1 p2 (re) |
110 rev offset length ..... linkrev nodeid p1 p2 (re) |
111 0 0 7 ..... 0 01365c4cca56 000000000000 000000000000 (re) |
111 0 0 7 ..... 0 01365c4cca56 000000000000 000000000000 (re) |