equal
deleted
inserted
replaced
107 two-point-one |
107 two-point-one |
108 >>>>>>> merge rev: 40d11a4173a8 - test: two -> two-point-one |
108 >>>>>>> merge rev: 40d11a4173a8 - test: two -> two-point-one |
109 three |
109 three |
110 |
110 |
111 $ hg debugindex test.txt |
111 $ hg debugindex test.txt |
112 rev offset length ..... linkrev nodeid p1 p2 (re) |
112 rev offset length linkrev nodeid p1 p2 |
113 0 0 7 ..... 0 01365c4cca56 000000000000 000000000000 (re) |
113 0 0 7 0 01365c4cca56 000000000000 000000000000 |
114 1 7 9 ..... 1 7b013192566a 01365c4cca56 000000000000 (re) |
114 1 7 9 1 7b013192566a 01365c4cca56 000000000000 |
115 2 16 15 ..... 2 8fe46a3eb557 01365c4cca56 000000000000 (re) |
115 2 16 15 2 8fe46a3eb557 01365c4cca56 000000000000 |
116 3 31 2. ..... 3 fc3148072371 7b013192566a 8fe46a3eb557 (re) |
116 3 31 2. 3 fc3148072371 7b013192566a 8fe46a3eb557 (re) |
117 4 5. 25 ..... 4 d40249267ae3 8fe46a3eb557 000000000000 (re) |
117 4 5. 25 4 d40249267ae3 8fe46a3eb557 000000000000 (re) |
118 |
118 |
119 $ hg log |
119 $ hg log |
120 changeset: 4:40d11a4173a8 |
120 changeset: 4:40d11a4173a8 |
121 tag: tip |
121 tag: tip |
122 parent: 2:96b70246a118 |
122 parent: 2:96b70246a118 |