equal
deleted
inserted
replaced
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 |
|
107 no unresolved files; you may continue your unfinished operation |
107 |
108 |
108 $ hg rebase --continue |
109 $ hg rebase --continue |
109 warning: new changesets detected on source branch, not stripping |
110 warning: new changesets detected on source branch, not stripping |
110 |
111 |
111 $ hg tglogp |
112 $ hg tglogp |