Gutter marks are buggy for SVN conflicts

sascha-wolf / sublime-GitConflictResolver

A little plugin to help you resolving this nasty conflicts.

MIT License

44 stars 6 forks source link

Open sascha-wolf opened 10 years ago

sascha-wolf commented 10 years ago

Probably related to the regular expression.

sascha-wolf commented 10 years ago

Example:

<<<<<<< .mine
ours ...
=======
theirs ...
>>>>>>> .r33477