Expand description
Structs§
- Labels
- The set of labels to annotate conflict markers with.
- Options
- Options for the builtin text driver.
Enums§
- Conflict
- What to do to resolve a conflict.
- Conflict
Style - The way the built-in text driver will express merge conflicts in the resulting file.