equal
deleted
inserted
replaced
165 reverting babar |
165 reverting babar |
166 $ safesed 's/dix/ten/' babar |
166 $ safesed 's/dix/ten/' babar |
167 $ hg resolve --all -m |
167 $ hg resolve --all -m |
168 (no more unresolved files) |
168 (no more unresolved files) |
169 $ hg evolve --continue |
169 $ hg evolve --continue |
170 grafting revision 5 |
170 grafting 5:71c18f70c34f "babar count up to fifteen" |
171 $ hg resolve -l |
171 $ hg resolve -l |
172 $ hg log -G |
172 $ hg log -G |
173 @ changeset: 8:1836b91c6c1d |
173 @ changeset: 8:1836b91c6c1d |
174 | tag: tip |
174 | tag: tip |
175 | user: test |
175 | user: test |