Mercurial > hg
diff tests/test-rebase-mq.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 |
line wrap: on
line diff
--- a/tests/test-rebase-mq.t Wed Apr 01 08:42:00 2020 -0500 +++ b/tests/test-rebase-mq.t Mon Jul 13 16:42:44 2020 -0700 @@ -62,7 +62,7 @@ rebasing 2:3504f44bffc0 "P0" (f.patch qbase) merging f warning: conflicts while merging f! (edit, then use 'hg resolve --mark') - unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [1] Fix the 1st conflict: @@ -76,7 +76,7 @@ rebasing 3:929394423cd3 "P1" (f2.patch qtip tip) merging f warning: conflicts while merging f! (edit, then use 'hg resolve --mark') - unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [1] Fix the 2nd conflict: