74   -huit

    74   -huit

    75   +eight

    75   +eight

    76    neuf

    76    neuf

    77    dix

    77    dix

    78   $ hg amend

    78   $ hg amend

    80   $ hg evolve --update

    79   $ hg evolve --update

    81   move:[2] babar count up to fifteen

    80   move:[2] babar count up to fifteen

    82   atop:[3] babar count up to ten

    81   atop:[3] babar count up to ten

    83   merging babar

    82   merging babar

    84   working directory is now at 71c18f70c34f

    83   working directory is now at 71c18f70c34f

   120    eight

   119    eight

   121    neuf

   120    neuf

   122   -dix

   121   -dix

   123   +ten

   122   +ten

   124   $ hg amend

   123   $ hg amend

   126   $ hg evolve --update

   124   $ hg evolve --update

   127   move:[4] babar count up to fifteen

   125   move:[4] babar count up to fifteen

   128   atop:[5] babar count up to ten

   126   atop:[5] babar count up to ten

   129   merging babar

   127   merging babar

   130   warning: conflicts while merging babar! (edit, then use 'hg resolve --mark')

   128   warning: conflicts while merging babar! (edit, then use 'hg resolve --mark')

   207    eight

   205    eight

   208    neuf

   206    neuf

   209   -ten

   207   -ten

   210   +zehn

   208   +zehn

   211   $ hg amend

   209   $ hg amend

   213   $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH

   210   $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH

   214   $ hg evolve --tool touch <<EOF

   211   $ hg evolve --tool touch <<EOF

   215   > n

   212   > n

   216   > EOF

   213   > EOF

   217   move:[6] babar count up to fifteen

   214   move:[6] babar count up to fifteen