Mercurial > hg
comparison tests/test-rebase-mq-skip.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 | 35ebdbb38efb |
| children | f90a5c211251 |
comparison
equal
deleted
inserted
replaced
| 45149:87047efbc6a6 | 45150:dc5e5577af39 |
|---|---|
| 153 note: not rebasing 1:b4bffa6e4776 "r1" (qbase r1), its destination already has all its changes | 153 note: not rebasing 1:b4bffa6e4776 "r1" (qbase r1), its destination already has all its changes |
| 154 rebasing 2:c0fd129beb01 "r2" (r2) | 154 rebasing 2:c0fd129beb01 "r2" (r2) |
| 155 rebasing 3:6ff5b8feed8e "r3" (r3) | 155 rebasing 3:6ff5b8feed8e "r3" (r3) |
| 156 note: not rebasing 3:6ff5b8feed8e "r3" (r3), its destination already has all its changes | 156 note: not rebasing 3:6ff5b8feed8e "r3" (r3), its destination already has all its changes |
| 157 rebasing 4:094320fec554 "r4" (r4) | 157 rebasing 4:094320fec554 "r4" (r4) |
| 158 unresolved conflicts (see hg resolve, then hg rebase --continue) | 158 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
| 159 [1] | 159 [1] |
| 160 | 160 |
| 161 $ HGMERGE=internal:local hg resolve --all | 161 $ HGMERGE=internal:local hg resolve --all |
| 162 (no more unresolved files) | 162 (no more unresolved files) |
| 163 continue: hg rebase --continue | 163 continue: hg rebase --continue |