Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 30332:318a24b52eeb
spelling: fixes of non-dictionary words
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 17 Oct 2016 23:16:55 +0200 |
| parents | a2804ddcf9ae |
| children | 1070df141718 |
comparison
equal
deleted
inserted
replaced
| 30331:b19291e5d506 | 30332:318a24b52eeb |
|---|---|
| 64 C: a change/delete or delete/change conflict | 64 C: a change/delete or delete/change conflict |
| 65 D: a file that the external merge driver will merge internally | 65 D: a file that the external merge driver will merge internally |
| 66 (experimental) | 66 (experimental) |
| 67 m: the external merge driver defined for this merge plus its run state | 67 m: the external merge driver defined for this merge plus its run state |
| 68 (experimental) | 68 (experimental) |
| 69 f: a (filename, dictonary) tuple of optional values for a given file | 69 f: a (filename, dictionary) tuple of optional values for a given file |
| 70 X: unsupported mandatory record type (used in tests) | 70 X: unsupported mandatory record type (used in tests) |
| 71 x: unsupported advisory record type (used in tests) | 71 x: unsupported advisory record type (used in tests) |
| 72 l: the labels for the parts of the merge. | 72 l: the labels for the parts of the merge. |
| 73 | 73 |
| 74 Merge driver run states (experimental): | 74 Merge driver run states (experimental): |