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

Please add git merge conflict ligature #176

Closed
adinvadim opened this issue Apr 20, 2016 · 2 comments
Closed

Please add git merge conflict ligature #176

adinvadim opened this issue Apr 20, 2016 · 2 comments

Comments

@adinvadim
Copy link

adinvadim commented Apr 20, 2016 •
edited
Loading 

<<<<<<< HEAD
    <link type="text/css" rel="stylesheet" media="all" href="style.css" />
=======
    <!-- no style -->
>>>>>>> master

Now it's looks not so good
https://www.dropbox.com/s/gkbddo1r50vyhg3/Screenshot%202016-04-20%2019.53.21.png?dl=0
@suy
Copy link

suy commented Jul 11, 2016

This is a duplicate of #49.

@surma
Copy link

surma commented Jul 15, 2016

@adinvadim Can you close this in favor of #49?

@tonsky tonsky closed this as completed Jul 16, 2016
tonsky added a commit that referenced this issue Jul 17, 2016
@tonsky
- Removed !!! ??? ;;; &&& ||| =~ (closes #167) ~~~ %%%
4903955 
- New `calt` code disables ligatures on long sequences, e.g. `!!!!`,
  `>>>>`, etc (closes #49, closes #110, closes #176)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
4 participants
@surma @tonsky @suy @adinvadim