Translations:Extension:Paragraph-based Edit Conflict Interface/10/en


 * Inside the box containing the conflicting changes, both the conflicting text and your text is shown, and the differences between the two are highlighted.