Module difft::conflicts

source ·
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