Expand description
Apply conflict markers to obtain the original file contents.
https://git-scm.com/docs/git-merge#Documentation/git-merge.txt-mergeconflictStyle
Structs
Enums
Constants
Functions
- Convert a string with conflict markers into the two conflicting file contents.