rhysd conflict-marker.vim issues

rhysd / conflict-marker.vim

Weapon to fight against conflicts in Vim.

485 stars 18 forks source link

issues

Newest

Newest Most commented Recently updated Oldest Least commented Least recently updated

Add documents for mappings

#27 kyoh86 closed 3 months ago
0
Using this plugin with lazy-nvim

#26 MartinDelille closed 5 months ago
1
Support conflict-marker-size larger than 7

#25 sybereal closed 3 months ago
7
Should change key mappings of `c*`

#24 KSR-Yasuda opened 1 year ago
0
feat: wrap search for next/prev hunk

#23 hayderhassan opened 1 year ago
0
add :ConflictMarkerCommonAncestors

#22 tomtomjhj opened 1 year ago
0
Minor improvements

#21 tomtomjhj closed 1 year ago
1
Doc updates and change default g:conflict_marker_common_ancestors

#20 Frederick888 opened 2 years ago
0
add more autocommand events to re-detect markers

#19 rohieb closed 2 years ago
5
Add flag to toggle detection at runtime

#18 bmundt6 closed 2 years ago
2
Highlighting doesn't work

#17 AnatoleLucet opened 3 years ago
10
lazy load conflict-marker.vim doesn't highlight at first, but highlight after re-focus on terminal.

#16 ghost closed 3 years ago
1
Enhancement: Adopt both in reverse order

#15 ruifm closed 3 years ago
1
Naming conventions

#14 kkoomen closed 3 years ago
2
Feature enable common ancestors (diff3)

#13 ghost closed 4 years ago
2
Thanks!

#12 LandonSchropp opened 4 years ago
1
Add more autocommands to refresh highlighting

#11 akinsho closed 4 years ago
1
match conflict markers more liberally

#10 rohieb closed 4 years ago
2
.gitignore tags files, and run CI on trusty rather than xenial

#9 cxw42 closed 4 years ago
1
Error: BufReadPost - Unknown function and Invalid expression

#8 TamaMcGlinn opened 4 years ago
0
Define new syntax regions for advanced highlighting

#7 gbcreation closed 4 years ago
3
Make `]x` and `[x` movements wrap around the end of file

#6 axlebedev opened 6 years ago
1
Support conflictStyle = diff3

#5 unphased closed 6 years ago
2
please add a gif/screenshots to the readme

#4 vitaly-zdanevich closed 4 years ago
1
conflict-marker is slow on large files

#3 haifengkao opened 7 years ago
3
Support for Parent

#2 spf13 closed 4 years ago
6
Instructions for installation

#1 musiphil closed 9 years ago
3