Mercurial > hg-stable
changeset 26361:6b4a0c602bec
merge: fix mergestate comment
| author | timeless@mozdev.org |
|---|---|
| date | Fri, 25 Sep 2015 00:54:20 -0400 |
| parents | b2415e94b2f5 |
| children | 3bfc473f4d33 |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
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: