--- a/hgext3rd/evolve/evolvecmd.py Fri Mar 20 12:37:44 2020 +0700
+++ b/hgext3rd/evolve/evolvecmd.py Wed Mar 25 17:44:08 2020 -0400
@@ -1616,9 +1616,9 @@
Interrupted
===========
- The `hg evolve` command is an all purpose tool that solve all kind of
+ The `hg evolve` command is an all purpose tool that solves all kinds of
instabilities in your repository. Sometimes, instability resolution will lead
- to merge conflict that cannot be solved without a human intervention (same as
+ to merge conflicts that cannot be solved without human intervention (same as
`hg merge`). This can lead to an "interrupted state" where human assistance is
requested. There are three things which you can do when you face a similar
situation: