# HG changeset patch
# User timeless@mozdev.org
# Date 1443156860 14400
# Node ID 6b4a0c602bec3c6c528f290d9e39a82e0b97b3e4
# Parent  b2415e94b2f5171f673ecd2dceaffce536b8d14b
merge: fix mergestate comment

diff -r b2415e94b2f5 -r 6b4a0c602bec mercurial/merge.py
--- 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: