Mercurial > hg
diff 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 |
line wrap: on
line diff
--- a/tests/test-rebase-mq-skip.t Wed Apr 01 08:42:00 2020 -0500 +++ b/tests/test-rebase-mq-skip.t Mon Jul 13 16:42:44 2020 -0700 @@ -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