christoomey vim-conflicted issues

christoomey / vim-conflicted

Easy git merge conflict resolution in Vim

MIT License

271 stars 12 forks source link

issues

Newest

Newest Most commented Recently updated Oldest Least commented Least recently updated

Strange failure mode on GitNextUpdate from last file

#29 JESii opened 1 year ago
1
Fix doc to use as mergetool

#28 LittleFox94 closed 4 years ago
1
fugitive throwing "No matching autocommands" error

#27 JESii closed 1 year ago
2
Add user autocmd

#26 BlueDrink9 closed 4 years ago
1
Option to not overwrite the tabline

#25 stellarhoof opened 4 years ago
0
Document how to make Conflicted as a mergetool #16

#24 sharils closed 4 years ago
1
Add user autocmd event when conflicted started

#23 BlueDrink9 closed 4 years ago
5
E15: Invalid expression: pyeval('powerline.new_window()')%{ConflictedVersion()}

#22 albasili closed 4 years ago
1
Fix for filenames with spaces

#21 kwstannard closed 4 years ago
2
support 3-way vertical diff by default

#20 toejough closed 5 years ago
1
Use Gdiffsplit! with fugitive 3.0

#19 geoffharcourt closed 5 years ago
1
Conflicted only shows two tabs

#18 JESii closed 2 years ago
9
Update TabEdit to work with latest fugitive.vim

#17 anhari closed 2 years ago
3
Usage as mergetool

#16 p-o-bcak closed 6 years ago
1
In Neovim it's splitting into rows instead of columns

#15 brodock closed 6 years ago
1
Error detected while processing function ConflictedTabLabel

#14 albasili opened 6 years ago
2
Errors when running :Conflicted under nvim (2.0.0).

#13 przem8k closed 7 years ago
1
GitNextConflict should abort if there are still merge markers in the file

#12 joshk0 opened 7 years ago
3
Windows are line up in vertical order, how can it be changed to horizontal?

#11 whitesiroi closed 8 years ago
2
Error when running `:Conflicted`

#10 jakecraige closed 9 years ago
3
Provide command and optional mapping for diff focus

#9 christoomey opened 9 years ago
0
Confirm that cherry-pick is covered as well

#8 christoomey opened 9 years ago
0
Splits out of order after running :GitNextConflict

#7 christoomey closed 10 years ago
0
Conflicted opens with the 3 views in stacked vertically

#6 JESii closed 10 years ago
2
Use branch names rather than 'upstream' & 'local'

#5 christoomey opened 10 years ago
1
Strange errors with `vim +Conflicted`

#4 calebhearth closed 10 years ago
5
Fix spelling of Statusline

#3 calebhearth closed 10 years ago
0
Warning when running vundle for the second time

#2 zamith closed 10 years ago
2
Delay when deleting visual text

#1 christoomey closed 10 years ago
0