This enumeration defines constants for three-way merging action types. You can use the numeric values from scripting languages that do not have access to the symbolic enumeration constants.
Constant | Value | Description |
---|---|---|
twmaMergeChange | 0x0000 (0) | The lines described by the ThreeWayMergeAction object should be merged into the central file. |
twmaMarkConflict | 0x0001 (1) | The lines described by the ThreeWayMergeAction object should be marked as conflicting. No merging can be performed with them. |