Mercurial > hg
comparison tests/test-fix.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 | a6ef1e8e2f6d |
| children | a253ded5b03d |
comparison
equal
deleted
inserted
replaced
| 45149:87047efbc6a6 | 45150:dc5e5577af39 |
|---|---|
| 866 | 866 |
| 867 $ hg --config extensions.rebase= rebase -r 1 -d 0 | 867 $ hg --config extensions.rebase= rebase -r 1 -d 0 |
| 868 rebasing 1:c3b6dc0e177a "foo 2" (tip) | 868 rebasing 1:c3b6dc0e177a "foo 2" (tip) |
| 869 merging foo.whole | 869 merging foo.whole |
| 870 warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') | 870 warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') |
| 871 unresolved conflicts (see hg resolve, then hg rebase --continue) | 871 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
| 872 [1] | 872 [1] |
| 873 | 873 |
| 874 $ hg --config extensions.rebase= fix --working-dir | 874 $ hg --config extensions.rebase= fix --working-dir |
| 875 abort: unresolved conflicts | 875 abort: unresolved conflicts |
| 876 (use 'hg resolve') | 876 (use 'hg resolve') |