| changeset 42804 | 7b80ad5af239 |
| parent 42621 | 99ebde4fec99 |
| child 43591 | b56c6647f65e |
| 42803:8ab1ae7f1cf4 | 42804:7b80ad5af239 |
|---|---|
504 $ hg resolve -l |
504 $ hg resolve -l |
505 U e |
505 U e |
506 $ hg rebase -s 2 -d 7 |
506 $ hg rebase -s 2 -d 7 |
507 rebasing 2:177f92b77385 "c" |
507 rebasing 2:177f92b77385 "c" |
508 abort: outstanding merge conflicts |
508 abort: outstanding merge conflicts |
509 (use 'hg resolve' to resolve) |
|
509 [255] |
510 [255] |
510 $ hg resolve -l |
511 $ hg resolve -l |
511 U e |
512 U e |
512 |
513 |
513 ========================== |
514 ========================== |