# HG changeset patch
# User timeless@mozdev.org
# Date 2015-09-25 04:54:20
# Node ID 6b4a0c602bec3c6c528f290d9e39a82e0b97b3e4
# Parent  b2415e94b2f5171f673ecd2dceaffce536b8d14b

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 @@ class mergestate(object):
 
     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: