Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 26361:6b4a0c602bec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix mergestate comment
author timeless@mozdev.org
date Fri, 25 Sep 2015 00:54:20 -0400
parents d3bd6cefd742
children 5bd7c4c07f6d
line wrap: on
line diff
--- 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: