| Submitter | timeless@mozdev.org |
|---|---|
| Date | Sept. 25, 2015, 6:33 a.m. |
| Message ID | <885601eff6483f0b485a.1443162805@waste.org> |
| Download | mbox | patch |
| Permalink | /patch/10626/ |
| State | Accepted |
| Headers | show |
Comments
On Fri, Sep 25, 2015 at 01:33:25AM -0500, timeless@mozdev.org wrote: > # HG changeset patch > # User timeless@mozdev.org > # Date 1443156860 14400 > # Fri Sep 25 00:54:20 2015 -0400 > # Node ID 885601eff6483f0b485ac6f457faa2a39bc69f23 > # Parent b80b2ee71a08d00ec4008f3131bdf3c72e4ec2ba > merge: fix mergestate comment taking this one, but leaving 2 and 3 for interested parties, as I'm not sure how I feel. > > 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: > > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@selenic.com > https://selenic.com/mailman/listinfo/mercurial-devel
Patch
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: