A little plugin to help you resolving this nasty conflicts.
Stars
44
Forks
6
Watchers
44
Open Issues
8
Overall repository health assessment
No package.json found
This might not be a Node.js project
No contributors data available
Fix sublime icon pathing by using "/" instead of os.path.join
17080abView on GitHubPlugin: Fix "Show Conflict Files" cursor bug, refactor plugin structure
2c6d529View on GitHubPlugin: Disable the search for a conflict on opening a view
986597cView on GitHubPlugin: Major refactoring - Move a lot of functionality into own submodules
eb732f7View on GitHubPlugin: Refactor ListConflictFiles into more submethods
4b8f379View on GitHubPlugin: Minor formatting and refactoring of function calls
cc0e3d7View on GitHubPlugin: Ensure cursor is set when opening a conflict file
34f0123View on GitHub