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.

Sign up for GitHub

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

Jump to bottom

Use smerge-mode for merge conflict font lock #527

Closed
gracjan opened this issue Mar 18, 2015 · 0 comments
Closed

Use smerge-mode for merge conflict font lock #527

gracjan opened this issue Mar 18, 2015 · 0 comments
Labels
well-defined-task

Comments

@gracjan
Copy link
Contributor

gracjan commented Mar 18, 2015

Currently haskell-mode has hand crafted font lock for git conflict markers. It comes from old days when modes had such additional features. Meanwhile smerge-mode (standard in Emacs) has much better visual controls and adds control commands on top of it.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
well-defined-task
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@gracjan