We can see the folding in this Diff/Merge screen by the + signs:
Diff/Merge
+
That used to not happen and I want to permanently disable the foldi