Skip to content

bug: Unable to see highlighted section in merge conflict #78

@SafetyMary

Description

@SafetyMary

Did you check docs and existing issues?

  • I have read all the solarized-osaka.nvim docs
  • I have searched the existing issues of solarized-osaka.nvim
  • I have searched the existing issues of plugins related to this issue

Neovim version (nvim -v)

v0.11.6

Operating system/version

OpenSUSE TW

Describe the bug

Unable to see highlighted area within a merge conflict ("git mergetool").

Image

Steps To Reproduce

  1. Create a merge conflict
  2. Execute "git mergetool" with nvimdiff
  3. Highlight areas of merge conflict

Expected Behavior

Highlighted area and area of merge conflict should be visibly distinguishable.

Repro

-- DO NOT change the paths and don't remove the colorscheme
local root = vim.fn.fnamemodify("./.repro", ":p")

-- set stdpaths to use .repro
for _, name in ipairs({ "config", "data", "state", "cache" }) do
  vim.env[("XDG_%s_HOME"):format(name:upper())] = root .. "/" .. name
end

-- bootstrap lazy
local lazypath = root .. "/plugins/lazy.nvim"
if not vim.loop.fs_stat(lazypath) then
  vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", lazypath, })
end
vim.opt.runtimepath:prepend(lazypath)

-- install plugins
local plugins = {
  "craftzdog/solarized-osaka.nvim",
  "craftzdog/solarized-osaka.nvim",
  -- add any other plugins here
}
require("lazy").setup(plugins, {
  root = root .. "/plugins",
})

vim.cmd.colorscheme("solarized-osaka")
-- add anything else here

Metadata

Metadata

Assignees

No one assigned

    Labels

    bugSomething isn't working

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions