A plugin for JetBrains IDE aim to highlight git conflict contents and make it easier to fix the conflicts.
Home Page:http://plugins.jetbrains.com/plugin/10656-git-conflict
Geek Repo:Geek Repo
Github PK Tool:Github PK Tool