conflicts property

List<String> conflicts
final

Paths edited on both sides to different content — true conflicts.

Implementation

final List<String> conflicts;