christoomey/vim-conflicted

Issues

• Strange failure mode on GitNextUpdate from last file

  #29 opened 2 years ago by JESii
  1

• fugitive throwing "No matching autocommands" error

  #27 opened 2 years ago by JESii
  2

• Conflicted only shows two tabs

  #18 opened 2 years ago by JESii
  9

• Add user autocmd event when conflicted started

  #23 opened 4 years ago by BlueDrink9
  5

• Option to not overwrite the tabline

  #25 opened 4 years ago by stellarhoof
  0

• E15: Invalid expression: pyeval('powerline.new_window()')%{ConflictedVersion()}

  #22 opened 5 years ago by albasili
  1

• Usage as mergetool

  #16 opened 6 years ago by p-o-bcak
  1

• In Neovim it's splitting into rows instead of columns

  #15 opened 6 years ago by brodock
  1

• Error detected while processing function ConflictedTabLabel

  #14 opened 6 years ago by albasili
  2

• Errors when running :Conflicted under nvim (2.0.0).

  #13 opened 7 years ago by przem8k
  1

• GitNextConflict should abort if there are still merge markers in the file

  #12 opened 8 years ago by joshk0
  3

• Windows are line up in vertical order, how can it be changed to horizontal?

  #11 opened 9 years ago by whitesiroi
  2

• Use branch names rather than 'upstream' & 'local'

  #5 opened 10 years ago by christoomey
  1

• Error when running `:Conflicted`

  #10 opened 9 years ago by jakecraige
  3

• Provide command and optional mapping for diff focus

  #9 opened 10 years ago by christoomey
  0

• Confirm that cherry-pick is covered as well

  #8 opened 10 years ago by christoomey
  0

• Splits out of order after running :GitNextConflict

  #7 opened 10 years ago by christoomey
  0

• Conflicted opens with the 3 views in stacked vertically

  #6 opened 10 years ago by JESii
  2

• Warning when running vundle for the second time

  #2 opened 11 years ago by zamith
  2

• Delay when deleting visual text

  #1 opened 11 years ago by christoomey
  0

• Strange errors with `vim +Conflicted`

  #4 opened 11 years ago by calebhearth
  5