diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 86355102c..3865a3fd7 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -129,6 +129,7 @@ body: plenary = "https://github.com/nvim-lua/plenary.nvim.git", telescope = "https://github.com/nvim-telescope/telescope.nvim", diffview = "https://github.com/sindrets/diffview.nvim", + -- or: diffview = "https://github.com/dlyongemallo/diffview-plus.nvim", neogit = "https://github.com/NeogitOrg/neogit" }) -- WARN: Do all plugin setup, test runs, reproductions, etc. AFTER calling setup with a list of plugins! diff --git a/README.md b/README.md index 481bed510..75a00e171 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,9 @@ Here's an example spec for [Lazy](https://github.com/folke/lazy.nvim), but you'r "nvim-lua/plenary.nvim", -- required -- Only one of these is needed. - "sindrets/diffview.nvim", -- optional - "esmuellert/codediff.nvim", -- optional + "sindrets/diffview.nvim", -- optional + "dlyongemallo/diffview-plus.nvim", -- optional + "esmuellert/codediff.nvim", -- optional -- For a custom log pager "m00qek/baleia.nvim", -- optional @@ -332,7 +333,7 @@ neogit.setup { -- Neogit only provides inline diffs. If you want a more traditional way to look at diffs, you can use `diffview`. -- The diffview integration enables the diff popup. -- - -- Requires you to have `sindrets/diffview.nvim` installed. + -- Requires you to have `dlyongemallo/diffview.nvim` installed. diffview = nil, -- Alternative diff viewer integration. diff --git a/doc/neogit.txt b/doc/neogit.txt index abea8e38e..0ca6ae52a 100644 --- a/doc/neogit.txt +++ b/doc/neogit.txt @@ -289,7 +289,7 @@ to Neovim users. -- Neogit only provides inline diffs. If you want a more traditional way to look at diffs, you can use `diffview`. -- The diffview integration enables the diff popup. -- - -- Requires you to have `sindrets/diffview.nvim` installed. + -- Requires you to have `sindrets/diffview.nvim` or `dlyongemallo/diffview-plus.nvim` installed. diffview = nil, -- Alternative diff viewer integration. @@ -1462,7 +1462,7 @@ ref range. For these actions to become available, Neogit needs to have a diff viewer integration enabled. Supported viewers are: -- `diffview.nvim`: https://github.com/sindrets/diffview.nvim +- `diffview.nvim`: https://github.com/dlyongemallo/diffview.nvim - `codediff.nvim`: https://github.com/esmuellert/codediff.nvim By default, Neogit will auto-detect which viewer is available. You can