Meziantou.FrameworkTextMergeConflictStyle Enum
Specifies how TextMergeResult.Text writes a conflict.
public enum TextMergeConflictStyleFields
| Name | Value | Description |
|---|---|---|
Merge | 0 | Writes both sides between <<<<<<<, ======= and >>>>>>> markers, as git merge does by default. |
Diff3 | 1 | Also writes the base text after a ||||||| marker, as git merge does with merge.conflictStyle=diff3. |