sindrets / diffview.nvim Goto Github PK

Hi Sindre!
Your plugin is amazin looks way more cleanier for me checking diff's than fugitive.
But the problem is that closing multiple buffers manually feels weird, and writing DiffviewClose seems bit hassle.
Is it possible to change this into DiffviewToggle to easily open and close it?

1. About the cursor line, I am curious about how you solve this neovim/neovim#9800.

2. About the background for diff deleted, how did you get those stripes on it?

It seems that diffview uses a global swap file. This means its features cannot be used in multiple neovim sessions at the same time:

:DiffviewFileHistory
Found a swap file by the name "~/.local/share/nvim/swap//diffview:%%%null.swp"
          owned by: galli   dated: Wed Sep 01 10:04:59 2021
         file name: diffview:///null
          modified: no
         user name: galli   host name: galli-miro
        process ID: 721982 (STILL RUNNING)
While opening file "diffview:///null"
      CANNOT BE FOUND
(1) Another program may be editing the same file.  If this is the case,
    be careful not to end up with two different instances of the same
    file when making changes.  Quit, or continue with caution.
(2) An edit session for this file crashed.
    If this is the case, use ":recover" or "vim -r diffview:///null"
    to recover the changes (see ":help recovery").
    If you did this already, delete the swap file "/home/galli/.local/share/nvim/swap//diffview:%%%null.swp"
    to avoid this message

I'm trying to apply colors to the viewer via vim.cmd('higlight ...'). Map the following groups:

DiffAdd
DiffDelete
DiffChange
DiffText

Are there more groups?

Hi 👋🏾 ,

Thanks for your work on this, I was sorely missing a way to diff things.
I just tried configuring some keybindings and was surprised to find that if I added just a single override to my keybindings setup it removes all default keybindings. This seems like pretty unexpected behaviour since I think most plugins will usually maintain the rest of their keybindings and just overwrite the ones you specify.

This looks like it was a conscious decision though, so not sure how open you are to it but I was thinking that you could do a merge on that line instead of either or and if a user wanted everything disabled which is the only reason I think that behaviour would be preferable maybe add a config option so users can turn off all default mappings?

anyway just though I'd raise it for discussion, despite it being easy enough to work around

I love this plugin, so thank you very much for your work.

One thing I'm missing though is the ability to use inline-diffs, instead of side by side.

For lots of minor changes, I find it's a lot easier to read.

Sth like this:

Is this anything that is planned?

What I'm missing from this incredibly useful plugin is a nice completion for the :DiffviewOpen command. When I toggle the completion with vim fugitive's :Gvdiffsplit for example, I get a list of all tags, branches and files. :DiffviewOpen only provides a list of hashes, which I find hard to utilize and files after closing arguments with --.

A comparison between the two:

Any chance we can get something like this for diffview.nvim?

I found that DiffViewOpen only support dir. Sometimes I only want to diff the current file that I an editing. Can DiffViewOpen add support for the diff of a single file with files panel off?

would be good to provide a option to exclude untracked files

So we could use something like:

local cb = require('diffview.config').diffview_callback

require('diffview').setup({
  key_bindings = {
    view = {
      ['<leader>c'] = cb('diffview_close'),
      -- ...
    },
    file_panel = {
      ['<leader>c'] = cb('diffview_close'),
      -- ...
    }
  }
})

To would avoid the need of creating a normal ("global") keybinding to execute :DiffviewClose (which makes sense because we only need to run this when we're using diffview).

Awesome plugin btw

Thank you for the nice plugin 👍

One thing I'm currently struggling with is the "missing" Ge[dit] from fugitive.
When diffing a file I'd love to have a way to open the currently selected file as a normal buffer.

Main use case is when checking changes of a commit and noticing an error, fix it and return to diffview.

In fugitive the git repository is automatically chosen for the current buffer.
This is such a nice feature and would be awesome to be integrated here as well.

It would be great if we could load every revision of a file into the left pane and then browse the diff.
I feel I could be able to do this if you are interested. (maybe with a little bit of guidance)

Hey 🙂

I've tried to run :DiffviewOpen origin/master... but it seems to show the diff for origin/master..HEAD (double-dot range). How do I get the plugin to show the diff for a triple-dot range?

Hi,

Thanks for the plugin, I have been using it and it's been wonderful.
I started using the file history regularly but I noticed that I can only see the changes in the file itself and I don't get the fold that allows me to see other files changed in the same commit

When I press <C-d> I get the diff view and there I can see changes in other files but I don't see them in the history view.

My config is a copy paste of the defaults in the readme:

local cb = require("diffview.config").diffview_callback

require("diffview").setup({
  diff_binaries = false, -- Show diffs for binaries
  use_icons = true, -- Requires nvim-web-devicons
  file_panel = {
    position = "left", -- One of 'left', 'right', 'top', 'bottom'
    width = 35, -- Only applies when position is 'left' or 'right'
    height = 10, -- Only applies when position is 'top' or 'bottom'
  },
  file_history_panel = {
    position = "bottom",
    width = 35,
    height = 16,
    log_options = {
      max_count = 256, -- Limit the number of commits
      follow = false, -- Follow renames (only for single file)
      all = false, -- Include all refs under 'refs/' including HEAD
      merges = false, -- List only merge commits
      no_merges = false, -- List no merge commits
      reverse = false, -- List commits in reverse order
    },
  },
  key_bindings = {
    disable_defaults = false, -- Disable the default key bindings
    -- The `view` bindings are active in the diff buffers, only when the current
    -- tabpage is a Diffview.
    view = {
      ["<tab>"] = cb("select_next_entry"), -- Open the diff for the next file
      ["<s-tab>"] = cb("select_prev_entry"), -- Open the diff for the previous file
      ["<leader>e"] = cb("focus_files"), -- Bring focus to the files panel
      ["<leader>b"] = cb("toggle_files"), -- Toggle the files panel.
    },
    file_panel = {
      ["j"] = cb("next_entry"), -- Bring the cursor to the next file entry
      ["<down>"] = cb("next_entry"),
      ["k"] = cb("prev_entry"), -- Bring the cursor to the previous file entry.
      ["<up>"] = cb("prev_entry"),
      ["<cr>"] = cb("select_entry"), -- Open the diff for the selected entry.
      ["o"] = cb("select_entry"),
      ["<2-LeftMouse>"] = cb("select_entry"),
      ["-"] = cb("toggle_stage_entry"), -- Stage / unstage the selected entry.
      ["S"] = cb("stage_all"), -- Stage all entries.
      ["U"] = cb("unstage_all"), -- Unstage all entries.
      ["X"] = cb("restore_entry"), -- Restore entry to the state on the left side.
      ["R"] = cb("refresh_files"), -- Update stats and entries in the file list.
      ["<tab>"] = cb("select_next_entry"),
      ["<s-tab>"] = cb("select_prev_entry"),
      ["<leader>e"] = cb("focus_files"),
      ["<leader>b"] = cb("toggle_files"),
    },
    file_history_panel = {
      ["g!"] = cb("options"), -- Open the option panel
      ["<C-d>"] = cb("open_in_diffview"), -- Open the entry under the cursor in a diffview
      ["zR"] = cb("open_all_folds"),
      ["zM"] = cb("close_all_folds"),
      ["j"] = cb("next_entry"),
      ["<down>"] = cb("next_entry"),
      ["k"] = cb("prev_entry"),
      ["<up>"] = cb("prev_entry"),
      ["<cr>"] = cb("select_entry"),
      ["o"] = cb("select_entry"),
      ["<2-LeftMouse>"] = cb("select_entry"),
      ["<tab>"] = cb("select_next_entry"),
      ["<s-tab>"] = cb("select_prev_entry"),
      ["<leader>e"] = cb("focus_files"),
      ["<leader>b"] = cb("toggle_files"),
    },
    option_panel = {
      ["<tab>"] = cb("select"),
      ["q"] = cb("close"),
    },
  },
})

Thank you very much!

Hi! Sorry for bothering with a non project related issue, but that colorscheme is just too beautiful to pass by :D

What is the colorscheme used in the main readme screenshot?

Great plugin btw :)

Hi 👋🏾 ,

I've recently noticed some errors whilst opening diffview with no arguments via DiffViewOpen in a couple of different projects. The error that occurs is

E5108: Error executing lua ...ack/packer/opt/diffview.nvim/lua/diffview/file-entry.lua:133: Vim(lua):E5108: Error executing lua Vim:E5300: Expected a Number or a String

It seems to then prevent the diff for that file from showing correctly. Not a 100% sure what's going on but for a bit more context on my setup.

I lazy load diffview using packer not sure if this relevant using

use {"sindrets/diffview.nvim", module = "diffview", cmd = "DiffviewOpen"}

This all seems to have begun shortly after the api PR was merged if that helps which is when I think maybe the file entry structure was added?

Thanks so much for writing this plugin!

I was wondering what you think of showing the file panel as a file tree, which I think would give you a better idea of which files have changed and how the overall project structure has changed in a diff.

Something like:

/path/to/project/

Changes:
M  backend/
M    file_1.py
A    file_2.py
D    file_3.py
M  frontend/
A    components/
A      file_4.tsx
A      file_5.tsx
D    common/
D      file_6.tsx

Showing changes for:
abcdef..bcdefg

(obviously with the nice colors that already exist)

This also avoids the problem of having a really long line width since we currently have the file name, the additions/deletions, and the file path:

M  example_file.hs 5, 14 src/MyApp/components/internal/

Hi, I installed this plugin, mainly because of DiffviewFileHistory, however that doesn't seem to be a command I can run, despite being mentioned in the documentation (README basically)

Thank you

Hello everyone,

I have some problems to run your plugin.

E5108: Error executing lua .../plugged/diffview.nvim/lua/diffview/views/file_entry.lua:154: attempt to index field 'opt' (a nil value)

Can anyone help me?

NVIM v0.5.0-dev+1295-g3fc71ea22 Build type: RelWithDebInfo LuaJIT 2.1.0-beta3 Compilation: /usr/bin/cc -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -O2 -g -Og -g -Wall -Wextra -pedantic -Wno-unused-parameter -Wstrict-prototypes -std=gnu99 -Wshadow -Wconversion -Wmissing-prototypes -Wvla -fstack-protector-strong -fno-common -fdiagnostics-color=always -DINCLUDE_GENERATED_DECLARATIONS -D_GNU_SOURCE -DNVIM_MSGPACK_HAS_FLOAT32 -DNVIM_UNIBI_HAS_VAR_FROM -DMIN_LOG_LEVEL=3 -I/home/runner/work/neovim/neovim/build/config -I/home/runner/work/neovim/neovim/src -I/home/runner/work/neovim/neovim/.deps/usr/include -I/usr/include -I/home/runner/work/neovim/neovim/build/src/nvim/auto -I/home/runner/work/neovim/neovim/build/include Compiled by runner@fv-az64-704

Thanks for help.

Hi! This plugin looks great and I can't wait to try it out! The example image in the README looks very cool and I had a few questions about that setup.

1. Which plugin are you using to get both listchars and indent guides to show together? The indent guide plugin I'm using currently doesn't support this.
2. What colorscheme is being used? I really like the look.

Great work on this plugin. Along with Neogit this will be so helpful.

I realise this is a bit of an odd request, but here goes anyway:

Highlighting of diffs in (Neo)Vim is a counter-intuitive. When you have version A and B of a file and diff them, A will show the diff relative to B, while B shows the diff relative to A. In practise this means that e.g. a line removed by B shows up as an addition in A, while not showing up in B. Here's an example of that:

In addition, changes in B tend to highlighted using the DiffText highlight group. This can result in diffs largely looking similar highlight wise, making it difficult to see what actually changed.

For vim-fugitive I have a hack to fix this (see here). This basically uses winhl to overwrite highlight groups in the appropriate fugitive buffer. The result is something that looks like this:

Note how in the old version (left) deletions are shown in red, while additions in the new file (right) are in green. This is what you'd expect when looking at a diff, instead of the default Vim mess.

For diffview.nvim this doesn't work. Buffer names don't have predictable names I can use to inject my winhl rules. There are no hooks of any kind that I can tap into either. Which brings me to my request:

Would it be possible to somehow expose a hook that runs for old/new versions in a diff, or perhaps use specific buffer names (e.g. before: diffview/XXX.rb) for old/new versions? That would make it possible to fix the diff highlights.

First off, wow, this plugin is tremendous. Great job.

One nitpick for me though is that when I tab through changed files, the highlighted file in the file list doesn't change to update which one I'm currently on.

EDIT: I just noticed it does work for me sometimes, so I wonder if there's a state or interaction that causes it to lose sync? Can anyone else confirm they've ever experienced this?

It would be nice if it was possible to commit from the diffview interface, as can be done through the fugitive interface.

Hi! First, a big thanks for the plugin, I'm a big fan. As a colemak user, I'm very appreciative of the disable_defaults option.

However I occasionally find myself needing to discard an entire file. As far as I can see, this isn't a operation in your plugin.

Do you think this is a feature you would be willing to add at some point?

Hi! Thank you a lot for your plugin!
I would like to suggest to add the ability to compare two files.

Something like DiffviewOpen file1 file2. When I trying to do so I have the following error:

E5108: Error executing lua ...nvim/pack/plugins/opt/diffview.nvim/lua/diffview/lib.lua:67: attempt to index a nil value

Hi, thanks for the plugin.
Is there any config to make itu side by side vertically top and bottom instead?
I have a trouble since my screen isn't that wide for side by side left and right
thank you

Hey! Thanks for making this plugin, I really appreciate it. It looks like a more robust solution to what I had done locally in my init.vim, but uses nicer UI 👍

I have an idea about a feature for the way diffs are displayed, and I'm not sure how to tackle it. It's probably not related to this plugin, but I don't have certainty, so maybe you could at least point me in the right direction.

Background

Git has a color-moved functionality that highlights moved code in a different way than regular additions/deletions.

After I enable it in my git config, the functionality works well in the terminal using regular git diff and using delta:

(notice the blue/purple lines - those represent the move)

However, it does not affect the way diffs are shown inside neovim - the moved code is highlighted as if it was a delete/add operation, there is no way to distinguish them from actual deletes/adds:

Feature

Ideally, there would be a separate highlight for code that is moved in a diff

Hey! Thank you for making this plugin!
I think the interaction with the diffs should function on the repo (sorry, but I do not know how to word this). It should work as a standard vimdiff view.

The example of usage that would be nice:

• If I am in the Index diff, then :diffput and :diffget should work on the hunk as in a vimdiff. Now this returns an error as the diff is not marked as modifiable
• If I save the "Head" diff (the one on the left) this should stage the the changes added so that I can now commit

Here is a cast of the error now and how I would expect it to work (demostrated on :Gvdiffsplit from fugitive)
§

Hey, in the screenshot the tabline shows "Source Control", how can I enable that? Is there an autocmd/callback that is fired when the view is openeds/closed?

Edit: and while I'm here, how do you get the removed hunks to show like this?

Hi,

I've setup the plugin according to the docs but some keybindings are not working for me. It could be that I am understanding the plugin incorrectly

I can use and focus_files and toggle_files but when I press j and k in the right_panel, it moves just one line ahead like in normal mode instead of to the next diff.

Also is the X key supposed to revert the state back to original? That's also not working for me.

Please let me know what I may be doing wrong here.

return require('packer').startup(function()
  -- Packer can manage itself
  use 'wbthomason/packer.nvim'

  -- tpope
  use 'tpope/vim-surround'
  use 'tpope/vim-fugitive'
  -- git
  use { 'lewis6991/gitsigns.nvim',
	  requires = {
		  'nvim-lua/plenary.nvim'
	  }
  }
  use 'sindrets/diffview.nvim'
  -- colors
  use 'norcalli/nvim-colorizer.lua'
  -- File explorer
  use 'kyazdani42/nvim-web-devicons'
  use 'kyazdani42/nvim-tree.lua'
  -- lsp
  use 'neovim/nvim-lspconfig'
  use 'glepnir/lspsaga.nvim'
  use {'folke/trouble.nvim',
    requires = 'kyazdani42/nvim-web-devicons'
  }
  -- formatter
  use 'sbdchd/neoformat'
  -- autocomplete
  use 'hrsh7th/nvim-compe'
  use 'hrsh7th/vim-vsnip'
  use 'rafamadriz/friendly-snippets'
  -- file and string search
  use {'nvim-telescope/telescope.nvim',
    requires = { 
			'nvim-lua/popup.nvim', 
			'nvim-lua/plenary.nvim'
		}
  }
  use 'nvim-telescope/telescope-fzy-native.nvim'
  use 'nvim-telescope/telescope-project.nvim'
  
  -- syntax highlights
  use 'Yagua/nebulous.nvim'
  use {'nvim-treesitter/nvim-treesitter', run = ":TSUpdate"}
  use 'andymass/vim-matchup'
  -- comments
  use 'terrortylor/nvim-comment'
  use 'JoosepAlviste/nvim-ts-context-commentstring'
  -- status and buffer line
  use 'glepnir/galaxyline.nvim'
	use 'akinsho/nvim-bufferline.lua'
	-- debugger
	use 'sakhnik/nvim-gdb'

end)

require'nvim_comment'.setup()

require'nvim-treesitter.configs'.setup {
    ensure_installed = O.treesitter.ensure_installed, -- one of "all", "maintained" (parsers with maintainers), or a list of languages
    ignore_install = O.treesitter.ignore_install,
    matchup = {
        enable = true,              -- mandatory, false will disable the whole extension
        -- disable = { "c", "ruby" },  -- optional, list of language that will be disabled
    },
    highlight = {
        enable = O.treesitter.highlight.enabled -- false will disable the whole extension
    },
    context_commentstring = {
        enable = true,
        config = {
          css = '// %s'
        }
      },
    -- indent = {enable = true, disable = {"python", "html", "javascript"}},
    --indent = {enable = true},
    autotag = {enable = true},
}

require("nebulous").setup()

require('gitsigns').setup()

local cb = require'diffview.config'.diffview_callback

require'diffview'.setup {
  diff_binaries = false,    -- Show diffs for binaries
  file_panel = {
    width = 35,
    use_icons = true        -- Requires nvim-web-devicons
  },
  key_bindings = {
    disable_defaults = false,                   -- Disable the default key bindings
    -- The `view` bindings are active in the diff buffers, only when the current
    -- tabpage is a Diffview.
    view = {
      ["<tab>"]     = cb("select_next_entry"),  -- Open the diff for the next file 
      ["<s-tab>"]   = cb("select_prev_entry"),  -- Open the diff for the previous file
      ["<leader>e"] = cb("focus_files"),        -- Bring focus to the files panel
      ["<leader>b"] = cb("toggle_files"),       -- Toggle the files panel.
    },
    file_panel = {
      ["j"]             = cb("next_entry"),         -- Bring the cursor to the next file entry
      ["<down>"]        = cb("next_entry"),
      ["k"]             = cb("prev_entry"),         -- Bring the cursor to the previous file entry.
      ["<up>"]          = cb("prev_entry"),
      ["<cr>"]          = cb("select_entry"),       -- Open the diff for the selected entry.
      ["o"]             = cb("select_entry"),
      ["<2-LeftMouse>"] = cb("select_entry"),
      ["-"]             = cb("toggle_stage_entry"), -- Stage / unstage the selected entry.
      ["S"]             = cb("stage_all"),          -- Stage all entries.
      ["U"]             = cb("unstage_all"),        -- Unstage all entries.
      ["X"]             = cb("restore_entry"),      -- Restore entry to the state on the left side.
      ["R"]             = cb("refresh_files"),      -- Update stats and entries in the file list.
      ["<tab>"]         = cb("select_next_entry"),
      ["<s-tab>"]       = cb("select_prev_entry"),
      ["<leader>e"]     = cb("focus_files"),
      ["<leader>b"]     = cb("toggle_files"),
    }
  }
}

Hi, great plugin! Wanted to have something like this for some time now.

One issue though - if neovim is started in subdirectory of repository the :DiffviewOpen right window is empty - the current file state is not displayed. It looks that there is some issue with file resolution as file path is resolved to git root, but as the vim is started it subdirectory it can not find the right file.

Hello!

I really like the look of your plugin so I would like to integrate your plugin with neogit.

Some things are still a bit unclear for me so I'd appreciate it if you could help me with a few things:

• Is there a way to get notified when something happens?
  • for example you commit a change; how can I get notified?
• Are you going to provide an API which can be used by other plugins?
  • I am mainly looking for ensurance that the API won't have any breaking changes too often
• Could you support feeding the plugin the files myself? Right now opening the diff is a bit too slow for my taste and neogit already has the information when trying to open the diff.
• Is any merge conflict support planned or even wanted?

In the README, 'nvim-web-devicons' is optional, but 'DiffviewOpen' executes failed:

E5108: Error executing lua ...nter/.vim/bundle/diffview.nvim/lua/diffview/renderer.lua:82: module 'nvim-web-devicons' not found:
        no field package.preload['nvim-web-devicons']
        no file './nvim-web-devicons.lua'
        no file '/home/runner/work/neovim/neovim/.deps/usr/share/luajit-2.1.0-beta3/nvim-web-devicons.lua'
        no file '/usr/local/share/lua/5.1/nvim-web-devicons.lua'
        no file '/usr/local/share/lua/5.1/nvim-web-devicons/init.lua'
        no file '/home/runner/work/neovim/neovim/.deps/usr/share/lua/5.1/nvim-web-devicons.lua'
        no file '/home/runner/work/neovim/neovim/.deps/usr/share/lua/5.1/nvim-web-devicons/init.lua'
        no file './nvim-web-devicons.so'
        no file '/usr/local/lib/lua/5.1/nvim-web-devicons.so'
        no file '/home/runner/work/neovim/neovim/.deps/usr/lib/lua/5.1/nvim-web-devicons.so'
        no file '/usr/local/lib/lua/5.1/loadall.so'

Hi! Thank you a lot for the awesome plugin!

But I have some issues with scrolling. Sometimes one of the parts does not move and sometimes it moves, but the position is incorrect. It happens only if I use mouse wheel for scrolling:

I would love to see the directory structure in the files panel. That will give me immediate clarity how the files relate to each other (are they in the same directory?).

I would imagine there could be a mapping that would change the files view to either a directory view (hierarchical) or a flat list (as it is now).

Being able to collapse/open directories would be an additional benefit

Have you considered using https://github.com/dandavison/delta for the git diff?

Hi,

Is there a way to configure keybindings without using the setup function? Eg nmap j DiffViewSelectNextEntry?
It would be nice if the mappings were public so I can remap them freely. Ideally having the diffview panel have its own filetype is the best because one can then use the native ftplugin/after mechanism to set custom options & keybindings for that filetype.

Thanks

Hi,

Thank you for your plugin, I really like it but unfortunately it just displays the right buffer (sometimes both buffers) as empty when opening :DiffviewOpen.

I digged a little and found out that in my ~/.gitconfig

[submodule]
recurse = true

is responsible for this behavior. When setting it to false everything works fine. I would be glad if you could fix it :-)

OS: Linux
Neovim: 0.5
diffview.nvim: latest commit #36

Best regard Andy

First of all, thank you very much for making this!

When the cursor is in one of the diff buffers, then all popup windows like Telescope, or WhichKey, also get a weird diff view.

Do you have any idea how to fix this?

Focusing the file list and then opening a poup is ok

How come yours have this diagonal lines on the diffs, when on my config they are actually dashes?

If you move a file and add it to tracking, then Diffview displays an error instead of the file content: fatal: path 'path/to/file' does not exist (neither on disk nor in the index)

When running :DiffviewFileHistory on a file that has been renamed/moved, I'm not getting commits before the rename commit in the file history panel. There are only a couple commits after the rename/move commit like so:

M | ... ... | some change
A | ... ... | move file to ...

However if I run !git log --follow %, then I get all the commits after the rename commit as expected (around 60). I get the same output of around 60 commits after running :0Gclog (from vim-fugitive).

Here's my configuration:

 local cb = require("diffview.config").diffview_callback

require("diffview").setup({
  diff_binaries = false,
  use_icons = false,

  file_panel = {
    position = "left",
    width = 40,
  },

  file_history_panel = {
    position = "bottom",
    height = 16,
    follow = true,
  },

  key_bindings = {
    disable_defaults = false,
    file_panel = {
      ["k"] = cb("prev_entry"),
      ["j"] = cb("next_entry"),
      ["[f"] = cb("select_prev_entry"),
      ["]f"] = cb("select_next_entry"),
      ["<leader>t"] = cb("toggle_files"),
    },
    file_history_panel = {
      ["k"] = cb("prev_entry"),
      ["j"] = cb("next_entry"),
      ["[f"] = cb("select_prev_entry"),
      ["]f"] = cb("select_next_entry"),
      ["<leader>t"] = cb("toggle_files"),
      ["g?"] = cb("options"),
      ["zC"] = cb("close_all_folds"),
      ["zM"] = cb("close_all_folds"),
      ["zO"] = cb("open_all_folds"),
      ["zR"] = cb("open_all_folds"),
      ["<leader>gD"] = cb("open_in_diffview"),
    },
    option_panel = {
      ["<return>"] = cb("select"),
      ["q"] = cb("close"),
    },
    view = {
      ["[f"] = cb("select_prev_entry"),
      ["]f"] = cb("select_next_entry"),
      ["<leader>t"] = cb("toggle_files"),
    },
  },
})

I'll take a closer look at this when I get home, though I'm wondering if you know what might be causing this?

This stackoverflow question is a great starting point for understanding how merge conflict resolution works with the builtin diffing tool.

One thing I noticed right away is that by default 4 splits appear. I'm not really a fan of this kind of resolution so I would propose either a traditional 2 or 3 way split approach. We could also try to replicate VSCode's way of doing this as it is very space efficient and based on my experience it is not too confusing.

We would also need to think about how we could reshape the API to support both normal diffing and merge conflict resolution.

@sindrets have you thought about how you want to implement this before?

I open the plugin with the :DiffviewOpen and I can "j" and "k" but when I press anything else like "tab" or "enter" the file doesn't change, I lose my pointer and I can't interact with neovim. I can't even quit.

The only thing I have done to installed it was adding this line use 'sindrets/diffview.nvim'
My Nvim version is: VIM v0.6.0-dev+8-g75f758b99

When I use :Diffviewopen, current buffer is in the new tab. How to disable it?

What theme vim do you use image screenshot?

Thank you so much for this plugin, I have been enjoying it with Neogit.

Here is a quick question on whether it is possible to toggle stage entry in view like the one we have in the file panel?
My workflow is something like this after I am done with a feature, I will go through all the changes locally through Diffview but I see myself going back and forth between the view and the file panel to stage a file.

Not sure if this is a good idea or possible. But will love to hear from you. Thanks again for this amazing plugin.

    view = {
      ["<tab>"]     = cb("select_next_entry"),  -- Open the diff for the next file 
      ["<s-tab>"]   = cb("select_prev_entry"),  -- Open the diff for the previous file
      ["<leader>e"] = cb("focus_files"),        -- Bring focus to the files panel
      ["<leader>b"] = cb("toggle_files"),       -- Toggle the files panel.
      -- ["-"] = cb("toggle_stage_entry")
    },

When a file doesn't have an icon, it's aligned differently from the rest. It would be nice to keep the same alignment, either by having a default icon or by adding spaces.

Thank you very much for developing this plugin, it's very useful.

Would it be possible to add support to stage hunks?

In Fugitive's :Gdiff view one can run :diffput on a visual selection to partially stage a hunk.