266   merging b

   266   merging b

   267   warning: conflicts during merge.

   267   warning: conflicts during merge.

   268   merging b failed!

   268   merging b failed!

   269   0 files updated, 0 files merged, 0 files removed, 2 files unresolved

   269   0 files updated, 0 files merged, 0 files removed, 2 files unresolved

   270   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

   270   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

   271   $ hg resolve -m b

   272   $ hg resolve -m b

   272 

   273 

   273 hg resolve with one unresolved, one resolved:

   274 hg resolve with one unresolved, one resolved:

   274 

   275 

   275   $ hg resolve --color=always -l

   276   $ hg resolve --color=always -l