Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unable to launch diffview 3 way split from git status #1645

Open
pachungulo opened this issue Jan 21, 2025 · 0 comments
Open

Unable to launch diffview 3 way split from git status #1645

pachungulo opened this issue Jan 21, 2025 · 0 comments
Labels
bug Something isn't working

Comments

@pachungulo
Copy link

pachungulo commented Jan 21, 2025

Description

In previous versions, dw would show the 3 way split, but now it doesn't appear.

I was also going to mention the missing keymaps, but those seem to be intentional. In any case, I feel like the diffview keymap changes could be related.

Finally, I wanted to add another data point that I too miss the old diffview mappings.

Neovim version

NVIM v0.10.3
Build type: Release
LuaJIT 2.1.1736781742

Operating system and version

macOS 14.6.1

Steps to reproduce

  • Create repository
  • Purposefully create a merge conflict and attempt to merge through neogit.
  • Head to the file and try to diff

Expected behavior

Expected behavior (at commit 419f08bbdfedcd7a85c7f96b3367eb2a63366ea0):
Image

Actual behavior

Actual Behavior (at up to date commit 63124cf520ff24d09deb3b850e053908ab0fc66a):
Image

Minimal config

-- my config for git stuff with lazy.nvim package manager
return {
    {
        "lewis6991/gitsigns.nvim",
        config = function()
            require("gitsigns").setup()
            vim.keymap.set("n", "<leader>hp", ":Gitsigns preview_hunk<CR>", { desc = "[H]unk [P]review" })
            vim.keymap.set("n", "<leader>hr", ":Gitsigns reset_hunk<CR>", { desc = "[H]unk [R]eset" })
            vim.keymap.set("n", "<leader>hs", ":Gitsigns stage_hunk<CR>", { desc = "[H]unk [S]tage" })
            vim.keymap.set("n", "<leader>hu", ":Gitsigns undo_stage_hunk<CR>", { desc = "[H]unk [U]nstage" })
            vim.keymap.set("n", "<leader>gb", ":Gitsigns blame<CR>", { desc = "[G]it [B]lame" })
            vim.keymap.set("n", "[c", ":Gitsigns prev_hunk<CR>", { desc = "Previous Hunk" })
            vim.keymap.set("n", "]c", ":Gitsigns next_hunk<CR>", { desc = "Next Hunk" })
        end,
    },
    {
        "NeogitOrg/neogit",
        dependencies = {
            "nvim-lua/plenary.nvim", -- required
            "sindrets/diffview.nvim", -- optional - Diff integration
            -- "nvim-telescope/telescope.nvim", -- optional
        },
        opts = {
            graph_style = "kitty",
        },
    },
}
@pachungulo pachungulo added the bug Something isn't working label Jan 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

1 participant