branch | stable |
changeset 45181 | 28163c5de797 |
parent 45150 | dc5e5577af39 |
child 45771 | f90a5c211251 |
--- a/tests/test-rebase-mq-skip.t Tue Jul 14 10:25:41 2020 +0200 +++ b/tests/test-rebase-mq-skip.t Mon Jul 20 21:56:27 2020 +0530 @@ -155,7 +155,7 @@ rebasing 3:6ff5b8feed8e "r3" (r3) note: not rebasing 3:6ff5b8feed8e "r3" (r3), its destination already has all its changes rebasing 4:094320fec554 "r4" (r4) - unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [1] $ HGMERGE=internal:local hg resolve --all