equal
deleted
inserted
replaced
71 $ hg rebase --continue --dest 4 |
71 $ hg rebase --continue --dest 4 |
72 abort: abort and continue do not allow specifying revisions |
72 abort: abort and continue do not allow specifying revisions |
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 a source and a base |
76 abort: cannot specify both --source and --base |
77 [255] |
77 [255] |
78 |
78 |
79 $ hg rebase --rev 5 --source 4 |
79 $ hg rebase --rev 5 --source 4 |
80 abort: cannot specify both a revision and a source |
80 abort: cannot specify both --rev and --source |
81 [255] |
81 [255] |
82 $ hg rebase --base 5 --rev 4 |
82 $ hg rebase --base 5 --rev 4 |
83 abort: cannot specify both a revision and a base |
83 abort: cannot specify both --rev and --base |
84 [255] |
84 [255] |
85 |
85 |
86 $ hg rebase --base 6 |
86 $ hg rebase --base 6 |
87 abort: branch 'default' has 3 heads - please rebase to an explicit rev |
87 abort: branch 'default' has 3 heads - please rebase to an explicit rev |
88 (run 'hg heads .' to see heads, specify destination with -d) |
88 (run 'hg heads .' to see heads, specify destination with -d) |