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   $ hg evolve --continue

   168   $ hg evolve --continue

   168   grafting revision 5

   169   grafting revision 5

   169   $ hg resolve -l

   170   $ hg resolve -l

   170   $ hg log -G

   171   $ hg log -G

   171   @  changeset:   8:1836b91c6c1d

   172   @  changeset:   8:1836b91c6c1d