143   [1]

   143   [1]

   144   $ echo resolved > a

   144   $ echo resolved > a

   145   $ hg resolve -m a

   145   $ hg resolve -m a

   146   (no more unresolved files)

   146   (no more unresolved files)

   147   continue: hg evolve --continue

   147   continue: hg evolve --continue

   149   evolving 9:df5d742141b0 "second"

   149   evolving 9:df5d742141b0 "second"

   150   committing files:

   150   committing files:

   151   a

   151   a

   152   committing manifest

   152   committing manifest

   153   committing changelog

   153   committing changelog