Mercurial > public > mercurial-scm > hg
diff tests/test-rebase-backup.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 | 6acbe86c6490 |
| children | 21733e8c924f |
line wrap: on
line diff
--- a/tests/test-rebase-backup.t Wed Apr 01 08:42:00 2020 -0500 +++ b/tests/test-rebase-backup.t Mon Jul 13 16:42:44 2020 -0700 @@ -126,7 +126,7 @@ rebasing 6:f8bc7d28e573 "c" 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] $ hg rebase --abort saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/818c1a43c916-2b644d96-backup.hg @@ -142,7 +142,7 @@ rebasing 6:f8bc7d28e573 "c" 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] $ hg rebase --abort rebase aborted