Mercurial > hg
diff tests/test-absorb-unfinished.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 | 537a8aeb9977 |
children | a253ded5b03d |
line wrap: on
line diff
--- a/tests/test-absorb-unfinished.t Wed Apr 01 08:42:00 2020 -0500 +++ b/tests/test-absorb-unfinished.t Mon Jul 13 16:42:44 2020 -0700 @@ -20,7 +20,7 @@ rebasing 1:c3b6dc0e177a "foo 2" (tip) merging foo.whole warning: conflicts while merging foo.whole! (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 --config extensions.rebase= absorb