conflicts property

List<ConflictRegion> conflicts
final

List of conflict regions (empty when the merge is clean).

Implementation

final List<ConflictRegion> conflicts;