Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix mergestate comment
authortimeless@mozdev.org
Fri, 25 Sep 2015 00:54:20 -0400
changeset 26361 6b4a0c602bec
parent 26360 b2415e94b2f5
child 26362 3bfc473f4d33
merge: fix mergestate comment
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Thu Sep 24 17:51:05 2015 -0400
+++ b/mercurial/merge.py	Fri Sep 25 00:54:20 2015 -0400
@@ -42,7 +42,7 @@
 
     it is stored on disk when needed. Two file are used, one with an old
     format, one with a new format. Both contains similar data, but the new
-    format can store new kind of field.
+    format can store new kinds of field.
 
     Current new format is a list of arbitrary record of the form:
Mercurial