equal
deleted
inserted
replaced
162 |
162 |
163 $ hg revert -r 5 --all |
163 $ hg revert -r 5 --all |
164 reverting babar |
164 reverting babar |
165 $ safesed 's/dix/ten/' babar |
165 $ safesed 's/dix/ten/' babar |
166 $ hg resolve --all -m |
166 $ hg resolve --all -m |
167 no more unresolved files |
167 (no more unresolved files) |
168 $ hg evolve --continue |
168 $ hg evolve --continue |
169 grafting revision 5 |
169 grafting revision 5 |
170 $ hg resolve -l |
170 $ hg resolve -l |
171 $ hg log -G |
171 $ hg log -G |
172 @ changeset: 8:1836b91c6c1d |
172 @ changeset: 8:1836b91c6c1d |