Please note: Using this version will lose the previous configuration of the "Git Conflict" plugin. This is because the new configuration is no longer compatible with the old version.
- Support diff3 style conflict markers.
- Fix an issue where there is an extra blank line in individual cases when resolving conflicts.