equal
deleted
inserted
replaced
167 (no more unresolved files) |
167 (no more unresolved files) |
168 $ hg evolve --continue |
168 $ hg evolve --continue |
169 grafting 5:71c18f70c34f "babar count up to fifteen" |
169 grafting 5:71c18f70c34f "babar count up to fifteen" |
170 $ hg resolve -l |
170 $ hg resolve -l |
171 $ hg log -G |
171 $ hg log -G |
172 @ changeset: 8:1836b91c6c1d |
172 @ changeset: 8:7f3d9db50b5d |
173 | tag: tip |
173 | tag: tip |
174 | user: test |
174 | user: test |
175 | date: Thu Jan 01 00:00:00 1970 +0000 |
175 | date: Thu Jan 01 00:00:00 1970 +0000 |
176 | summary: babar count up to fifteen |
176 | summary: babar count up to fifteen |
177 | |
177 | |
230 | parent: 0:29ec1554cfaf |
230 | parent: 0:29ec1554cfaf |
231 | user: test |
231 | user: test |
232 | date: Thu Jan 01 00:00:00 1970 +0000 |
232 | date: Thu Jan 01 00:00:00 1970 +0000 |
233 | summary: babar count up to ten |
233 | summary: babar count up to ten |
234 | |
234 | |
235 | o changeset: 8:1836b91c6c1d |
235 | o changeset: 8:7f3d9db50b5d |
236 | | user: test |
236 | | user: test |
237 | | date: Thu Jan 01 00:00:00 1970 +0000 |
237 | | date: Thu Jan 01 00:00:00 1970 +0000 |
238 | | summary: babar count up to fifteen |
238 | | summary: babar count up to fifteen |
239 | | |
239 | | |
240 | x changeset: 7:e04690b09bc6 |
240 | x changeset: 7:e04690b09bc6 |