Mercurial > hg
diff tests/test-copytrace-heuristics.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 | 5c2a4f37eace |
children | f90a5c211251 |
line wrap: on
line diff
--- a/tests/test-copytrace-heuristics.t Wed Apr 01 08:42:00 2020 -0500 +++ b/tests/test-copytrace-heuristics.t Mon Jul 13 16:42:44 2020 -0700 @@ -91,7 +91,7 @@ file 'a' was deleted in local [dest] but was modified in other [source]. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. What do you want to do? u - unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [1] $ cd .. @@ -248,7 +248,7 @@ file 'a' was deleted in local [dest] but was modified in other [source]. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. What do you want to do? u - unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [1] $ hg rebase --abort @@ -710,7 +710,7 @@ file 'a' was deleted in local [dest] but was modified in other [source]. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. What do you want to do? u - unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [1] But when we have "sourcecommitlimit > (no. of drafts from base to c1)", we do