Question 1

How do I stage changes with diffview.nvim?

Accepted Answer

Stage individual hunks by editing the index buffer in a diff view—after opening with no git rev, changes show the index on the left, and writing to it updates the index. Use default keymaps like 's' to toggle staging or 'S' to stage all entries.

Question 2

diffview.nvim vs fugitive.vim: which should I use?

Accepted Answer

Diffview.nvim is better for dedicated diff review and merge resolution with a unified interface, while fugitive.vim offers broader git command integration. Choose diffview if you prioritize visual diff cycling and conflict tools over general git operations.

Question 3

How to configure diffview.nvim layouts?

Accepted Answer

Configure layouts in the setup function under the 'view' table—set options like layout = 'diff2_horizontal' for default views. You can cycle layouts with the default keybinding g<C-x> and customize per view type (e.g., merge_tool, file_history).

Question 4

Does diffview.nvim work with Mercurial?

Accepted Answer

Yes, it has basic support for Mercurial ≥ 5.4.0, but the documentation and features are more git-centric. Some advanced options like log configurations are tailored for git, so Mercurial users might experience limitations.

Question 5

How to view the commit history of a file?

Accepted Answer

Use the :DiffviewFileHistory command with a file path, e.g., :DiffviewFileHistory % for the current file. It lists commits affecting that path and shows diffs, with options to filter by range or author, as explained in the file history section.

Question 6

What are the default keybindings for merge conflicts?

Accepted Answer

Default keybindings include [x and ]x to jump between conflicts, and mappings like co to choose the 'ours' version or ct for 'theirs'. These are documented in the view keymaps under diff3 and diff4 layouts for conflict resolution.

Question 7

How to install diffview.nvim with lazy.nvim?

Accepted Answer

Install using lazy.nvim by adding it to your plugin spec—e.g., { 'sindrets/diffview.nvim' }—and ensure dependencies like nvim-web-devicons are installed for icons. Then, call require('diffview').setup() with your configuration in a Lua file.

diffview.nvim

What is diffview.nvim?

Overview

Use Cases

Best For

Related Projects

Found a gem we're missing?

Not Ideal For

Pros & Cons

Pros

Cons

Frequently Asked Questions