| changeset 18935 | e5d9441ec281 |
| parent 18933 | 42b620fc89e2 |
| child 19213 | f324a9b8d4bf |
| 18934:93f3a06b2035 | 18935:e5d9441ec281 |
|---|---|
415 $ hg clone -q -u . b b3 |
415 $ hg clone -q -u . b b3 |
416 $ cd b3 |
416 $ cd b3 |
417 |
417 |
418 $ hg rebase -s 2 -d 1 --tool internal:fail |
418 $ hg rebase -s 2 -d 1 --tool internal:fail |
419 unresolved conflicts (see hg resolve, then hg rebase --continue) |
419 unresolved conflicts (see hg resolve, then hg rebase --continue) |
420 [255] |
420 [1] |
421 |
421 |
422 $ hg resolve -l |
422 $ hg resolve -l |
423 U c2 |
423 U c2 |
424 |
424 |
425 $ hg resolve -m c2 |
425 $ hg resolve -m c2 |