102 Solve the conflict and go on:

   102 Solve the conflict and go on:

   103 

   103 

   104   $ echo 'conflict solved' > A

   104   $ echo 'conflict solved' > A

   105   $ rm A.orig

   105   $ rm A.orig

   106   $ hg resolve -m A

   106   $ hg resolve -m A

   108 

   108 

   109   $ hg rebase --continue

   109   $ hg rebase --continue

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

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

   111 

   111 

   112   $ hg tglogp

   112   $ hg tglogp