165   $ hg revert -r 71c18f70c34f --all

   165   $ hg revert -r 71c18f70c34f --all

   166   reverting babar

   166   reverting babar

   167   $ safesed 's/dix/ten/' babar

   167   $ safesed 's/dix/ten/' babar

   168   $ hg resolve --all -m

   168   $ hg resolve --all -m

   169   (no more unresolved files)

   169   (no more unresolved files)

   170   $ hg evolve --continue

   171   $ hg evolve --continue

   171   evolving 4:71c18f70c34f "babar count up to fifteen"

   172   evolving 4:71c18f70c34f "babar count up to fifteen"

   172   $ hg resolve -l

   173   $ hg resolve -l

   173   $ hg log -G

   174   $ hg log -G

   174   @  changeset:   6:1836b91c6c1d

   175   @  changeset:   6:1836b91c6c1d