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

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

   115   [1]

   115   [1]

   116 

   116 

   117   $ f --dump --recurse *

   117   $ f --dump --recurse *

   118   d2: directory with 2 files

   118   d2: directory with 2 files

   124   >>>

   124   >>>

   125   0 base

   125   0 base

   126   <<<

   126   <<<

   127   f1:

   127   f1:

   128   >>>

   128   >>>

   220   3 files updated, 0 files merged, 0 files removed, 0 files unresolved

   220   3 files updated, 0 files merged, 0 files removed, 0 files unresolved

   221   (branch merge, don't forget to commit)

   221   (branch merge, don't forget to commit)

   222 

   222 

   223   $ f --dump --recurse *

   223   $ f --dump --recurse *

   224   d2: directory with 2 files

   224   d2: directory with 2 files

   230   >>>

   230   >>>

   231   0 base

   231   0 base

   232   <<<

   232   <<<

   233   f1:

   233   f1:

   234   >>>

   234   >>>

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

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

   307   (branch merge, don't forget to commit)

   307   (branch merge, don't forget to commit)

   308 

   308 

   309   $ f --dump --recurse *

   309   $ f --dump --recurse *

   310   d2: directory with 2 files

   310   d2: directory with 2 files

   316   >>>

   316   >>>

   317   0 base

   317   0 base

   318   <<<

   318   <<<

   319   f1:

   319   f1:

   320   >>>

   320   >>>