GitHub repository: CudaText-addons/cuda_git_conflict
Primary language: Python
Description: CudaText plugin. Adds a convenient command to solve git merge conflicts