Mercurial > evolve

changeset 5210:b9b71fdea693 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: fix some documentation grammar/typos
author Eric Spishak-Thomas <emspishak@gmail.com>
date Wed, 25 Mar 2020 17:44:08 -0400
parents 097c3a6a79c1
children 99123c3229b4 d5544ebf5836
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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: