Plugin: Equalize if syntax
Formatting: Follow common conventions
Plugin: New feature "Show Conflict Files"

 - New feature: Show Conflict Files
   List the files which contain conflicts; open them by selecting them
Docu: Update documentation and settings for "Show Conflict Files"
Docu: Add message file for the new version (1.4.0)