changeset 45826 | 21733e8c924f |
parent 45771 | f90a5c211251 |
child 50381 | 2cf264e9aa75 |
--- a/tests/test-rebase-mq-skip.t Sat Nov 07 21:50:28 2020 -0800 +++ b/tests/test-rebase-mq-skip.t Wed Oct 21 19:00:16 2020 -0700 @@ -156,7 +156,7 @@ 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') - [1] + [240] $ HGMERGE=internal:local hg resolve --all (no more unresolved files)