Mercurial > hg
comparison tests/test-absorb-unfinished.t @ 45150:dc5e5577af39
error: unify the error message formats for 'rebase' and 'unshelve'
Differential Revision: https://phab.mercurial-scm.org/D8730
| author | Daniel Ploch <dploch@google.com> |
|---|---|
| date | Mon, 13 Jul 2020 16:42:44 -0700 |
| parents | 537a8aeb9977 |
| children | a253ded5b03d |
comparison
equal
deleted
inserted
replaced
| 45149:87047efbc6a6 | 45150:dc5e5577af39 |
|---|---|
| 18 | 18 |
| 19 $ hg --config extensions.rebase= rebase -r 1 -d 0 | 19 $ hg --config extensions.rebase= rebase -r 1 -d 0 |
| 20 rebasing 1:c3b6dc0e177a "foo 2" (tip) | 20 rebasing 1:c3b6dc0e177a "foo 2" (tip) |
| 21 merging foo.whole | 21 merging foo.whole |
| 22 warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') | 22 warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') |
| 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' or 'hg rebase --abort') |