samoshkin/vim-mergetool

Issues

• MergetoolDiffExchange has undesired behavior

  #9 opened a month ago by MoezGholami
  1

• `set nomodifiable` precludes use of `:diffput`

  #27 opened 2 years ago by ahansen90
  0

• Confusion about remote vs local

  #26 opened 2 years ago by aimran-adroll
  1

• Keep both

  #25 opened 3 years ago by ahoereth
  0

• REMOTE and LOCAL buffers fail to load

  #24 opened 3 years ago by idbrii
  2

• Tried adding the keymapping but it doesnt work

  #23 opened 3 years ago by laleeroy
  0

• How to use BASE as the MERGED file?

  #21 opened 4 years ago by RTS5227
  0

• Add :help documentaion

  #20 opened 4 years ago by davewilmo
  0

• It's not possible to merge conflicts in the same branch.

  #11 opened 5 years ago by MoezGholami
  1

• Using g:MergetoolSetLayoutCallback for equal sized windows doesn't work on initial MergetoolStart

  #18 opened 5 years ago by idbrii
  1

• Does not seem to work on MacOS

  #12 opened 5 years ago by flavius
  1

• Support mergetool of any scm by loading necessary files at startup

  #13 opened 5 years ago by idbrii
  0

• Create doc for in-Vim help

  #8 opened 5 years ago by pappasam
  0

• Could be please provide a variable that stops using new tab?

  #6 opened 5 years ago by c02y
  0

• `git mergetool` [error]

  #4 opened 6 years ago by nicanordlc
  1