equal
deleted
inserted
replaced
2060 $ hg rebase -s 3 -d 5 |
2060 $ hg rebase -s 3 -d 5 |
2061 abort: rebase in progress |
2061 abort: rebase in progress |
2062 (use 'hg rebase --continue' or 'hg rebase --abort') |
2062 (use 'hg rebase --continue' or 'hg rebase --abort') |
2063 [255] |
2063 [255] |
2064 $ hg rebase --stop --continue |
2064 $ hg rebase --stop --continue |
2065 abort: cannot use --stop with --continue |
2065 abort: cannot specify both --stop and --continue |
2066 [255] |
2066 [255] |
2067 |
2067 |
2068 Test --stop moves bookmarks of original revisions to new rebased nodes: |
2068 Test --stop moves bookmarks of original revisions to new rebased nodes: |
2069 ====================================================================== |
2069 ====================================================================== |
2070 $ cd .. |
2070 $ cd .. |