105 

   105 

   106   $ echo 'conflict solved' > A

   106   $ echo 'conflict solved' > A

   107   $ rm A.orig

   107   $ rm A.orig

   108   $ hg resolve -m A

   108   $ hg resolve -m A

   109   (no more unresolved files)

   109   (no more unresolved files)

   110 

   111 

   111   $ hg rebase --continue

   112   $ hg rebase --continue

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

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

   113   rebasing 2:965c486023db "C"

   114   rebasing 2:965c486023db "C"

   114   warning: new changesets detected on source branch, not stripping

   115   warning: new changesets detected on source branch, not stripping