Mercurial > hg
comparison tests/test-sparse-profiles.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 | 21733e8c924f |
comparison
equal
deleted
inserted
replaced
| 45149:87047efbc6a6 | 45150:dc5e5577af39 |
|---|---|
| 198 temporarily included 2 file(s) in the sparse checkout for merging | 198 temporarily included 2 file(s) in the sparse checkout for merging |
| 199 merging backend.sparse | 199 merging backend.sparse |
| 200 merging data.py | 200 merging data.py |
| 201 warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark') | 201 warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark') |
| 202 warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark') | 202 warning: conflicts while merging data.py! (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 $ rm *.orig | 205 $ rm *.orig |
| 206 $ ls -A | 206 $ ls -A |
| 207 .hg | 207 .hg |
| 208 backend.sparse | 208 backend.sparse |