Mercurial > hg
comparison tests/test-rebase-detach.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 | 4edd427f34c1 |
| children | f90a5c211251 |
comparison
equal
deleted
inserted
replaced
| 45149:87047efbc6a6 | 45150:dc5e5577af39 |
|---|---|
| 295 $ hg phase --force --secret . | 295 $ hg phase --force --secret . |
| 296 $ hg rebase -s . -d B --config ui.merge=internal:merge | 296 $ hg rebase -s . -d B --config ui.merge=internal:merge |
| 297 rebasing 3:17b4880d2402 "B2" (tip) | 297 rebasing 3:17b4880d2402 "B2" (tip) |
| 298 merging B | 298 merging B |
| 299 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') | 299 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
| 300 unresolved conflicts (see hg resolve, then hg rebase --continue) | 300 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
| 301 [1] | 301 [1] |
| 302 $ hg resolve --all -t internal:local | 302 $ hg resolve --all -t internal:local |
| 303 (no more unresolved files) | 303 (no more unresolved files) |
| 304 continue: hg rebase --continue | 304 continue: hg rebase --continue |
| 305 $ hg rebase -c | 305 $ hg rebase -c |