Mercurial > hg
diff tests/test-rebase-bookmarks.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 | 4441705b7111 |
children | f90a5c211251 |
line wrap: on
line diff
--- a/tests/test-rebase-bookmarks.t Wed Apr 01 08:42:00 2020 -0500 +++ b/tests/test-rebase-bookmarks.t Mon Jul 13 16:42:44 2020 -0700 @@ -172,7 +172,7 @@ rebasing 3:3d5fa227f4b5 "C" (Y Z) merging c warning: conflicts while merging c! (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] $ echo 'c' > c $ hg resolve --mark c