rhysd/conflict-marker.vim

Issues

• Using this plugin with lazy-nvim

  #26 opened 2 months ago by MartinDelille
  1

• Make `]x` and `[x` movements wrap around the end of file

  #6 opened 6 years ago by axlebedev
  1

• Highlighting doesn't work

  #17 opened 4 years ago by AnatoleLucet
  10

• Naming conventions

  #14 opened 4 years ago by kkoomen
  2

• Thanks!

  #12 opened 4 years ago by LandonSchropp
  1

• lazy load conflict-marker.vim doesn't highlight at first, but highlight after re-focus on terminal.

  #16 opened 4 years ago by ulwlu
  1

• Enhancement: Adopt both in reverse order

  #15 opened 4 years ago by ruifm
  1

• Support for Parent

  #2 opened 4 years ago by spf13
  6

• Error: BufReadPost - Unknown function and Invalid expression

  #8 opened 5 years ago by TamaMcGlinn
  0

• please add a gif/screenshots to the readme

  #4 opened 5 years ago by vitaly-zdanevich
  1

• Support conflictStyle = diff3

  #5 opened 6 years ago by unphased
  2

• conflict-marker is slow on large files

  #3 opened 8 years ago by haifengkao
  3

• Instructions for installation

  #1 opened 9 years ago by musiphil
  3