equal
deleted
inserted
replaced
2056 [10] |
2056 [10] |
2057 |
2057 |
2058 $ hg rebase -s 3 -d 5 |
2058 $ hg rebase -s 3 -d 5 |
2059 abort: rebase in progress |
2059 abort: rebase in progress |
2060 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') |
2060 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') |
2061 [255] |
2061 [20] |
2062 $ hg rebase --stop --continue |
2062 $ hg rebase --stop --continue |
2063 abort: cannot specify both --stop and --continue |
2063 abort: cannot specify both --stop and --continue |
2064 [10] |
2064 [10] |
2065 |
2065 |
2066 Test --stop moves bookmarks of original revisions to new rebased nodes: |
2066 Test --stop moves bookmarks of original revisions to new rebased nodes: |