GitHub repository: liying2008/git-conflict
Primary language: Kotlin
Created: 2018-04-20T15:06:43Z
Description: A plugin for JetBrains IDE aim to highlight git conflict contents and make it easier to fix the conflicts.