v2.0.0

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.

v1.0.5

• Fix compatibility errors.
• Remove unneeded dependencies and reduce the size of the plugin.

v1.0.4

• Relax the restrictions on the IDE version.
• Fix compatibility errors.

v1.0.2

• Add plugin icon.
• Add settings reset function.
• Fix one bug ( #2 ).

v1.0.1

• Fixed a bug where the plugin was not available on version 2020.1 .

v1.0.0

• Supports custom color schemes.
• Fix one bug.

v0.0.1

• Add the "Auto" option to the Settings panel.(Please uninstall the previous version.)
• Fix one bug.

v0.0.1-rc

v0.0.1-rc