24 

    24 

    25 % Try to continue without solving the conflict

    25 % Try to continue without solving the conflict

    26 abort: unresolved merge conflicts (see hg resolve)

    26 abort: unresolved merge conflicts (see hg resolve)

    27 

    27 

    28 % Conclude rebase

    28 % Conclude rebase

    30 adding branch

    29 adding branch

    31 adding changesets

    30 adding changesets

    32 adding manifests

    31 adding manifests

    33 adding file changes

    32 adding file changes

    34 added 3 changesets with 3 changes to 3 files

    33 added 3 changesets with 3 changes to 3 files