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

Support (git) conflict marks #49

Closed
mrackwitz opened this issue Sep 11, 2015 · 1 comment
Closed

Support (git) conflict marks #49

mrackwitz opened this issue Sep 11, 2015 · 1 comment
Labels
contextual

Comments

@mrackwitz
Copy link

It would be nice to have support for conflict marks.

<<<<<<<
=======
>>>>>>>
@suy suy mentioned this issue Jul 11, 2016
Closed
@suy
Copy link

suy commented Jul 11, 2016

With merge.conflictStyle = diff3, there is also |||||||.

@tonsky tonsky closed this as completed in 08c4dd5 Jul 17, 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)
Losangelosgenetics pushed a commit to Losangelosgenetics/FiraCode that referenced this issue Mar 12, 2020
@smellsblue
Merge pull request tonsky#49 from bundler/various-fixes-3
5191669 
Various fixes 3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
contextual
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@tonsky @suy @mrackwitz