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

diff -r 097c3a6a79c1 -r b9b71fdea693 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Wed Mar 25 21:48:32 2020 +0100
+++ b/hgext3rd/evolve/evolvecmd.py	Wed Mar 25 17:44:08 2020 -0400
@@ -1618,9 +1618,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: