76 

    76 

    77   $ echo 'conflict solved' > A

    77   $ echo 'conflict solved' > A

    78   $ rm A.orig

    78   $ rm A.orig

    79   $ hg resolve -m A

    79   $ hg resolve -m A

    80   (no more unresolved files)

    80   (no more unresolved files)

    81   $ hg rebase --continue

    82   $ hg rebase --continue

    82   already rebased 1:27547f69f254 "B" as 45396c49d53b

    83   already rebased 1:27547f69f254 "B" as 45396c49d53b

    83   rebasing 2:965c486023db "C"

    84   rebasing 2:965c486023db "C"

    84 

    85 

    85   $ hg tglog

    86   $ hg tglog

   132 

   133 

   133   $ echo 'conflict solved' > A

   134   $ echo 'conflict solved' > A

   134   $ rm A.orig

   135   $ rm A.orig

   135   $ hg resolve -m A

   136   $ hg resolve -m A

   136   (no more unresolved files)

   137   (no more unresolved files)

   137   $ hg rebase --continue

   139   $ hg rebase --continue

   138   rebasing 5:01e6ebbd8272 "F" (tip)

   140   rebasing 5:01e6ebbd8272 "F" (tip)

   139   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-backup.hg (glob)

   141   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-backup.hg (glob)

   140 

   142 

   141   $ hg tglog

   143   $ hg tglog