equal
deleted
inserted
replaced
67 $ hg rebase --continue --collapse |
67 $ hg rebase --continue --collapse |
68 abort: cannot use collapse with continue or abort |
68 abort: cannot use collapse with continue or abort |
69 [255] |
69 [255] |
70 |
70 |
71 $ hg rebase --continue --dest 4 |
71 $ hg rebase --continue --dest 4 |
72 abort: abort and continue do not allow specifying revisions |
72 abort: cannot specify both --continue and --dest |
73 [255] |
73 [255] |
74 |
74 |
75 $ hg rebase --base 5 --source 4 |
75 $ hg rebase --base 5 --source 4 |
76 abort: cannot specify both --source and --base |
76 abort: cannot specify both --source and --base |
77 [255] |
77 [255] |