sindrets/diffview.nvim

Diffview.nvim is a plugin for Neovim, the terminal-based text editor, that makes reviewing git changes easier. When you have modified files in a project, opening the plugin brings up a single view that lists every changed file and lets you step through each one to see what changed, line by line. Without a tool like this, checking changes across many files requires opening each one separately in a split-screen comparison. The plugin adds two main views. The diff view shows all files changed relative to any git revision you specify. You can compare the current working state against the most recent commit, or compare any two historical commits by passing a range like a commit hash or a branch name. A tab and shift-tab let you cycle through the changed files one by one without closing and reopening the view. The file history view works as an interface to the git log command. You can open it for a specific file, a directory, or the whole project, and it lists every commit that touched those paths. From there you can open any commit to see what changed. The view also supports filtering by commit message or author, and can trace how a specific range of lines in a file changed across multiple commits. The merge tool activates automatically when you open the plugin during a git merge or rebase. Conflicted files appear in a three-way comparison showing your version, the incoming version, and the common ancestor. Keyboard shortcuts let you accept one side, the other, or a combination, and jump between conflict markers. The plugin requires Neovim version 0.7 or later and a recent version of Git. It is installed through any standard Neovim plugin manager.