Mercurial > hg
comparison mercurial/merge.py @ 26361:6b4a0c602bec
merge: fix mergestate comment
| author | timeless@mozdev.org |
|---|---|
| date | Fri, 25 Sep 2015 00:54:20 -0400 |
| parents | d3bd6cefd742 |
| children | 5bd7c4c07f6d |
comparison
equal
deleted
inserted
replaced
| 26360:b2415e94b2f5 | 26361:6b4a0c602bec |
|---|---|
| 40 class mergestate(object): | 40 class mergestate(object): |
| 41 '''track 3-way merge state of individual files | 41 '''track 3-way merge state of individual files |
| 42 | 42 |
| 43 it is stored on disk when needed. Two file are used, one with an old | 43 it is stored on disk when needed. Two file are used, one with an old |
| 44 format, one with a new format. Both contains similar data, but the new | 44 format, one with a new format. Both contains similar data, but the new |
| 45 format can store new kind of field. | 45 format can store new kinds of field. |
| 46 | 46 |
| 47 Current new format is a list of arbitrary record of the form: | 47 Current new format is a list of arbitrary record of the form: |
| 48 | 48 |
| 49 [type][length][content] | 49 [type][length][content] |
| 50 | 50 |