GitHub repository: realdubb/sublime-GitConflictResolver
Primary language: Python
Description: A little plugin to help you resolving this nasty conflicts.