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.
docs/obs-terms.rst
changeset 2862 07ce6c063c61
parent 1660 ec4167ac79ab
child 4615 8406d9b06130 
--- a/docs/obs-terms.rst	Tue Aug 29 12:17:48 2017 +0200
+++ b/docs/obs-terms.rst	Tue Aug 29 12:18:42 2017 +0200
@@ -145,7 +145,7 @@
 |                     |                          | conflict)                   |
 |                     |                          |                             |
 |                     |                          | (possible alternative names:|
-|                     |                          | clashing, rival, concurent, |
+|                     |                          | clashing, rival, concurrent,|
 |                     |                          | conflicting)                |
 |                     |                          |                             |
 |                     +--------------------------+-----------------------------+
@@ -231,7 +231,7 @@
 This is an important name as hg pull/push will suggest it the same way it
 suggest merging when you add heads.
 
-alternative names:
+Alternative names:
 
 - solve (too generic ?)
 - stabilize
evolve