[PATCH 1 of 3] merge: fix mergestate comment

[timeless at mozdev.org]

# HG changeset patch
# User timeless at mozdev.org
# Date 1443156860 14400
#      Fri Sep 25 00:54:20 2015 -0400
# Node ID 885601eff6483f0b485ac6f457faa2a39bc69f23
# Parent  b80b2ee71a08d00ec4008f3131bdf3c72e4ec2ba
merge: fix mergestate comment

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -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: