equal
deleted
inserted
replaced
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): |