| changeset 45215 | a253ded5b03d |
| parent 45150 | dc5e5577af39 |
| child 45771 | f90a5c211251 |
| 45213:d5ccc059fbcd | 45215:a253ded5b03d |
|---|---|
23 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
23 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
24 [1] |
24 [1] |
25 |
25 |
26 $ hg --config extensions.rebase= absorb |
26 $ hg --config extensions.rebase= absorb |
27 abort: rebase in progress |
27 abort: rebase in progress |
28 (use 'hg rebase --continue' or 'hg rebase --abort') |
28 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') |
29 [255] |
29 [255] |
30 |
30 |