halfbrained / cuda_git_conflict

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

Git Conflict Solver

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