Mercurial > evolve
diff tests/test-evolve-stop-orphan.t @ 3821:f67ac33c07d2
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
`evolve.interrupted-evolve` has the word evolve twice. Now that this help topic
is a part of evolve command, evolve.interrupted will mean the interrupted evolve
command only.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Mon, 11 Jun 2018 01:12:12 +0530 |
| parents | ededd22e7c7b |
| children | f0096db2a7b1 |
line wrap: on
line diff
--- a/tests/test-evolve-stop-orphan.t Thu Jun 07 22:59:39 2018 +0530 +++ b/tests/test-evolve-stop-orphan.t Mon Jun 11 01:12:12 2018 +0530 @@ -91,7 +91,7 @@ merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') evolve failed! - see `hg help evolve.interrupted-evolve` + see `hg help evolve.interrupted` abort: unresolved merge conflicts (see hg help resolve) [255] @@ -139,7 +139,7 @@ merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') evolve failed! - see `hg help evolve.interrupted-evolve` + see `hg help evolve.interrupted` abort: unresolved merge conflicts (see hg help resolve) [255] @@ -188,7 +188,7 @@ merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') evolve failed! - see `hg help evolve.interrupted-evolve` + see `hg help evolve.interrupted` abort: unresolved merge conflicts (see hg help resolve) [255] $ echo foo > d @@ -241,7 +241,7 @@ merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') evolve failed! - see `hg help evolve.interrupted-evolve` + see `hg help evolve.interrupted` abort: unresolved merge conflicts (see hg help resolve) [255] @@ -280,7 +280,7 @@ merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') evolve failed! - see `hg help evolve.interrupted-evolve` + see `hg help evolve.interrupted` abort: unresolved merge conflicts (see hg help resolve) [255] @@ -358,7 +358,7 @@ merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') evolve failed! - see `hg help evolve.interrupted-evolve` + see `hg help evolve.interrupted` abort: unresolved merge conflicts (see hg help resolve) [255]