Mercurial > hg
comparison tests/test-sparse.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 | 5c2a4f37eace |
| children | f90a5c211251 |
comparison
equal
deleted
inserted
replaced
| 45149:87047efbc6a6 | 45150:dc5e5577af39 |
|---|---|
| 198 $ hg rebase -d 1 -r 2 --config extensions.rebase= | 198 $ hg rebase -d 1 -r 2 --config extensions.rebase= |
| 199 rebasing 2:b91df4f39e75 "edit hide" (tip) | 199 rebasing 2:b91df4f39e75 "edit hide" (tip) |
| 200 temporarily included 2 file(s) in the sparse checkout for merging | 200 temporarily included 2 file(s) in the sparse checkout for merging |
| 201 merging hide | 201 merging hide |
| 202 warning: conflicts while merging hide! (edit, then use 'hg resolve --mark') | 202 warning: conflicts while merging hide! (edit, then use 'hg resolve --mark') |
| 203 unresolved conflicts (see hg resolve, then hg rebase --continue) | 203 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
| 204 [1] | 204 [1] |
| 205 | 205 |
| 206 $ hg debugsparse | 206 $ hg debugsparse |
| 207 [exclude] | 207 [exclude] |
| 208 hide* | 208 hide* |