84   getting f1

    84   getting f1

    85    f2: versions differ -> m

    85    f2: versions differ -> m

    86   picked tool ':dump' for f2 (binary False symlink False)

    86   picked tool ':dump' for f2 (binary False symlink False)

    87   merging f2

    87   merging f2

    88   my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@40494bf2444c

    88   my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@40494bf2444c

    89   1 files updated, 0 files merged, 0 files removed, 1 files unresolved

    91   1 files updated, 0 files merged, 0 files removed, 1 files unresolved

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

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

    91   [1]

    93   [1]

    92 

    94 

    93   $ head *

    95   $ head *