equal
deleted
inserted
replaced
285 > \|/ |
285 > \|/ |
286 > A |
286 > A |
287 > EOF |
287 > EOF |
288 |
288 |
289 $ hg rebase -s F --dest I --collapse # root (F) is not a merge |
289 $ hg rebase -s F --dest I --collapse # root (F) is not a merge |
|
290 rebasing 6:c82b08f646f1 "F" (F) |
|
291 file 'E' was deleted in local [dest] but was modified in other [source]. |
|
292 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
|
293 What do you want to do? u |
|
294 unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
295 [1] |
|
296 |
|
297 $ echo F > E |
|
298 $ hg resolve -m |
|
299 (no more unresolved files) |
|
300 continue: hg rebase --continue |
|
301 $ hg rebase -c |
290 rebasing 6:c82b08f646f1 "F" (F) |
302 rebasing 6:c82b08f646f1 "F" (F) |
291 rebasing 7:a6db7fa104e1 "G" (G) |
303 rebasing 7:a6db7fa104e1 "G" (G) |
292 rebasing 8:e1d201b72d91 "H" (H tip) |
304 rebasing 8:e1d201b72d91 "H" (H tip) |
293 saved backup bundle to $TESTTMP/external-parent/.hg/strip-backup/c82b08f646f1-f2721fbf-rebase.hg |
305 saved backup bundle to $TESTTMP/external-parent/.hg/strip-backup/c82b08f646f1-f2721fbf-rebase.hg |
294 |
306 |