hexpreview

include/gliff@types_MergeConflict.hrl

-record(merge_conflict, {
    merged :: binary(),
    conflicts :: list(gliff@types:conflict())
}).