git-conflicts topic
List
git-conflicts repositories
sublime-GitConflictResolver
44
Stars
6
Forks
Watchers
A little plugin to help you resolving this nasty conflicts.
