Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gutter marks are buggy for SVN conflicts #5

Open
sascha-wolf opened this issue Apr 29, 2014 · 1 comment
Open

Gutter marks are buggy for SVN conflicts #5

sascha-wolf opened this issue Apr 29, 2014 · 1 comment
Assignees
Labels

Comments

@sascha-wolf
Copy link
Owner

Probably related to the regular expression.

@sascha-wolf sascha-wolf self-assigned this Apr 29, 2014
@sascha-wolf
Copy link
Owner Author

Example:

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

1 participant