When the conflict includes something like ~~~~ (the users signature on talk pages), this is shown as is in the diff in the TwoColConflict interface. The pre-save transformations are not run before creating the diff.
https://www.mediawiki.org/wiki/Pre-save_transforms
Expected: The diff shows the users signature expanded.
Note: This sounds like it is the same issue we fixed before, but that was for the preview, which is JavaScript code. This bug here is in the backend.
Change 572891 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] [WIP] Run pre-save transformations before creating the diff
Change 573983 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Remove more unused code from SplitTwoColConflictHelper
Change 573983 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Remove more unused code from SplitTwoColConflictHelper
Change 572891 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Run pre-save transformations before creating the diff