3 ms·Correct, conflicts are not shown in the diff just the fact that they exist.by kyriakos 4y agoCorrect, conflicts are not shown in the diff just the fact that they exist.