Mercurial > hg
diff tests/test-rebase-interruptions.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 | e7af56a0733e |
| children | f90a5c211251 |
line wrap: on
line diff
--- a/tests/test-rebase-interruptions.t Wed Apr 01 08:42:00 2020 -0500 +++ b/tests/test-rebase-interruptions.t Mon Jul 13 16:42:44 2020 -0700 @@ -61,7 +61,7 @@ rebasing 2:965c486023db "C" merging A warning: conflicts while merging A! (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] Force a commit on C during the interruption: @@ -98,7 +98,7 @@ rebasing 2:965c486023db "C" merging A warning: conflicts while merging A! (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] Solve the conflict and go on: @@ -157,7 +157,7 @@ rebasing 2:965c486023db "C" merging A warning: conflicts while merging A! (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] Force a commit on B' during the interruption: @@ -229,7 +229,7 @@ rebasing 2:965c486023db "C" merging A warning: conflicts while merging A! (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] Change phase on B and B' @@ -302,7 +302,7 @@ rebasing 2:965c486023db "C" merging A warning: conflicts while merging A! (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 tglog @ 5: 45396c49d53b 'B' @@ -505,7 +505,7 @@ rebasing 1:fdaca8533b86 "b" merging a warning: conflicts while merging a! (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 a > a $ echo c >> a @@ -525,7 +525,7 @@ rebasing 2:fdaca8533b86 "b" (tip) merging a warning: conflicts while merging a! (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 a > a $ echo c >> a