# HG changeset patch
# User Eric Spishak-Thomas <emspishak@gmail.com>
# Date 1585172648 14400
# Node ID a28f24828f62c5e3a1ebd129505dd8d400a7a3bd
# Parent  d7f87c7cb1f01dda13ed21572750960d5340bda4
evolve: fix some documentation grammar/typos

diff -r d7f87c7cb1f0 -r a28f24828f62 hgext3rd/evolve/evolvecmd.py
--- 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: