/git-conflict

A plugin for JetBrains IDE aim to highlight git conflict contents and make it easier to fix the conflicts.

Primary LanguageKotlinApache License 2.0Apache-2.0

Watchers