149   updating: e 2/2 files (100.00%)

   149   updating: e 2/2 files (100.00%)

   150   picked tool 'internal:merge' for e (binary False symlink False)

   150   picked tool 'internal:merge' for e (binary False symlink False)

   151   merging e

   151   merging e

   152   my e@77eb504366ab+ other e@9c233e8e184d ancestor e@68795b066622

   152   my e@77eb504366ab+ other e@9c233e8e184d ancestor e@68795b066622

   153   warning: conflicts during merge.

   153   warning: conflicts during merge.

   155     searching for copies back to rev 1

   155     searching for copies back to rev 1

   156     unmatched files in local:

   156     unmatched files in local:

   157      c

   157      c

   158     all copies found (* = to merge, ! = divergent):

   158     all copies found (* = to merge, ! = divergent):

   159      c -> b *

   159      c -> b *