equal
deleted
inserted
replaced
2018 $ hg rebase -s 3 -d 5 |
2018 $ hg rebase -s 3 -d 5 |
2019 abort: rebase in progress |
2019 abort: rebase in progress |
2020 (use 'hg rebase --continue' or 'hg rebase --abort') |
2020 (use 'hg rebase --continue' or 'hg rebase --abort') |
2021 [255] |
2021 [255] |
2022 $ hg rebase --stop --continue |
2022 $ hg rebase --stop --continue |
2023 abort: cannot use --stop with --abort or --continue |
2023 abort: cannot use --stop with --continue |
2024 [255] |
2024 [255] |
2025 |
2025 |
2026 Test --stop moves bookmarks of original revisions to new rebased nodes: |
2026 Test --stop moves bookmarks of original revisions to new rebased nodes: |
2027 ====================================================================== |
2027 ====================================================================== |
2028 $ cd .. |
2028 $ cd .. |