liying2008/git-conflict

Issues

• Enable by default

  #12 opened a year ago by Desoroxxx
  0

• Request: Support diff3 style "base" markers

  #10 opened a year ago by cassdeckard
  3

• Error on IntelliJ Ultimate

  #8 opened a year ago by mauriciog98
  2

• java.lang.AssertionError when trying to highlight a folder

  #2 opened 4 years ago by Alan-Liang
  1

• Any reason this wouldn't work on PhpStorm 2020.1.1?

  #3 opened 4 years ago by xmarklar
  1