Conflict-marker.vim Alternatives

lazygit

simple terminal UI for git commands

vim-fugitive

fugitive.vim: A Git wrapper so awesome, it should be illegal

gitsigns.nvim

Git integration for buffers

tig

Text-mode interface for git

diffview.nvim

Single tabpage interface for easily cycling through diffs for all modified files for any git rev.

vim-floaterm

:computer: Terminal manager for (neo)vim

neogit

An interactive and powerful Git interface for Neovim, inspired by Magit

neovim-remote

:ok_hand: Support for --remote and friends.

vim-gitgutter

A Vim plugin which shows git diff markers in the sign column and stages/previews/undoes hunks and partial hunks.

diffconflicts

A better Vimdiff Git mergetool

git-conflict.nvim

A plugin to visualise and resolve merge conflicts in neovim

lazygit.nvim

Plugin for calling lazygit from within neovim.

vim-merginal

Fugitive extension to manage and merge Git branches

auto-git-diff

A vim plugin which shows git diff for Git Rebase Interactive

vim-mergetool

:cake: Efficient way of using Vim as a Git mergetool

committia.vim

A Vim plugin for more pleasant editing on commit messages

agitator.nvim

vim-gh-line

vim plugin that open the link of current line on github

tig-explorer.vim

Vim plugin to use Tig as a git client. Seamless switching between vim and Tig with opening in the same buffer.