equal
deleted
inserted
replaced
170 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
170 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
171 $ hg rebase --dest 4 |
171 $ hg rebase --dest 4 |
172 rebasing 3:3d5fa227f4b5 "C" (Y Z) |
172 rebasing 3:3d5fa227f4b5 "C" (Y Z) |
173 merging c |
173 merging c |
174 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
174 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
175 unresolved conflicts (see hg resolve, then hg rebase --continue) |
175 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
176 [1] |
176 [1] |
177 $ echo 'c' > c |
177 $ echo 'c' > c |
178 $ hg resolve --mark c |
178 $ hg resolve --mark c |
179 (no more unresolved files) |
179 (no more unresolved files) |
180 continue: hg rebase --continue |
180 continue: hg rebase --continue |