74 Solve the conflict and go on:

    74 Solve the conflict and go on:

    75 

    75 

    76   $ echo 'conflict solved' > A

    76   $ echo 'conflict solved' > A

    77   $ rm A.orig

    77   $ rm A.orig

    78   $ hg resolve -m A

    78   $ hg resolve -m A

    79   $ hg rebase --continue

    80   $ hg rebase --continue

    80 

    81 

    81   $ hg tglog

    82   $ hg tglog

    82   o  7:secret 'C'

    83   o  7:secret 'C'

    83   |

    84   |

   127 Solve the conflict and go on:

   128 Solve the conflict and go on:

   128 

   129 

   129   $ echo 'conflict solved' > A

   130   $ echo 'conflict solved' > A

   130   $ rm A.orig

   131   $ rm A.orig

   131   $ hg resolve -m A

   132   $ hg resolve -m A

   132   $ hg rebase --continue

   134   $ hg rebase --continue

   133   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)

   135   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)

   134 

   136 

   135   $ hg tglog

   137   $ hg tglog

   136   @  5:draft 'F' notdefault

   138   @  5:draft 'F' notdefault