Mercurial > public > mercurial-scm > hg-stable
diff tests/test-rebase-parameters.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 | 05654ea5137c |
| children | f90a5c211251 |
line wrap: on
line diff
--- a/tests/test-rebase-parameters.t Wed Apr 01 08:42:00 2020 -0500 +++ b/tests/test-rebase-parameters.t Mon Jul 13 16:42:44 2020 -0700 @@ -479,7 +479,7 @@ $ hg rebase -s 2 -d 1 --tool internal:fail rebasing 2:e4e3f3546619 "c2b" (tip) - unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [1] $ hg summary