Translations:Manual:MediaWiki feature list/149/en

MediaWiki will merge changes automatically if possible and otherwise require the user to do a manual merge.