Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext3rd/evolve/evolvecmd.py
branchstable
changeset 5210 b9b71fdea693
parent 5111 1fe3f7ffb462
child 5212 99123c3229b4 
--- 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:
evolve