Plugin for CudaText. Adds a convenient command to solve git merge conflicts
CudaText plugin. Adds a convenient command to solve git merge conflicts