218   move:[10] foobar to c

   218   move:[10] foobar to c

   219   atop:[11] foo to c

   219   atop:[11] foo to c

   220   merging c

   220   merging c

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

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

   222   evolve failed!

   222   evolve failed!

   224   abort: unresolved merge conflicts (see hg help resolve)

   224   abort: unresolved merge conflicts (see hg help resolve)

   225   [255]

   225   [255]

   226 

   226 

   227   $ echo FOObar > c

   227   $ echo FOObar > c

   228   $ hg resolve -m

   228   $ hg resolve -m

   275   move:[12] foobar to c

   275   move:[12] foobar to c

   276   atop:[13] foo to c

   276   atop:[13] foo to c

   277   merging c

   277   merging c

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

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

   279   evolve failed!

   279   evolve failed!

   281   abort: unresolved merge conflicts (see hg help resolve)

   281   abort: unresolved merge conflicts (see hg help resolve)

   282   [255]

   282   [255]

   283 

   283 

   284   $ echo foobar > c

   284   $ echo foobar > c

   285   $ hg resolve -m

   285   $ hg resolve -m