include/gliff@types_Conflict.hrl
-record(conflict, {
base_lines :: list(binary()),
our_lines :: list(binary()),
their_lines :: list(binary())
}).
-record(conflict, {
base_lines :: list(binary()),
our_lines :: list(binary()),
their_lines :: list(binary())
}).