Flags for handling conflicting content, to be used with the standard (text) merge driver.
See Implementation
Flags for handling conflicting content, to be used with the standard (text) merge driver.