Translations:Manual:MediaWiki feature list/112/en

Additionally, a diff is shown during an edit conflict so you can see exactly what you need to reintegrate.