Mercurial > evolve
diff tests/test-evolve-abort-contentdiv.t @ 3842:b293cce4ff55
evolve: point to `hg help evolve.interrupted` while resolving content-div
Recent test additions shows that --abort and --stop works well while resolving
content-divergence and we should advertise them. This patch does so by pointing
to evolve.interrupted help topic.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Tue, 12 Jun 2018 04:01:19 +0530 |
| parents | 82b79a8dafd9 |
| children | f9dad99a90d5 |
line wrap: on
line diff
--- a/tests/test-evolve-abort-contentdiv.t Tue Jun 12 03:29:13 2018 +0530 +++ b/tests/test-evolve-abort-contentdiv.t Tue Jun 12 04:01:19 2018 +0530 @@ -78,7 +78,7 @@ merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort + abort: fix conflicts and see `hg help evolve.interrupted` [255] $ hg status -v @@ -178,7 +178,7 @@ merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort + abort: fix conflicts and see `hg help evolve.interrupted` [255] $ hg evolve --abort @@ -338,7 +338,7 @@ merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort + abort: fix conflicts and see `hg help evolve.interrupted` [255] $ hg evolve --abort