Problem: pressing du on a UU file in fugitive status fell through to
the unstaged path, where get_index_content(:0:) fails because unmerged
files have no stage 0 entry. The fallback produced a useless diff of
HEAD vs working file with conflict markers shown as changes.
Solution: add a merge.lua module that diffs git show :2: (ours) vs
:3: (theirs), displays the result with full syntax and intra-line
highlighting, and provides resolution keymaps (doo/dot/dob/don/]x/[x)
that write back to the working file's conflict markers. Hunks are
matched to conflict regions by comparing diff del-lines against each
region's ours content. Resolved hunks are tracked per-buffer with
virtual text. commands.lua gains an unmerged branch in gdiff_file and
read_buffer, and plugin/diffs.lua registers Plug(diffs-merge-*)
mappings.
Problem: when git hits a merge conflict, users stare at raw <<<<<<<
markers with broken treesitter and noisy LSP diagnostics. Existing
solutions (git-conflict.nvim) use their own highlighting rather than
integrating with diffs.nvim's color blending pipeline.
Solution: add conflict.lua module that detects <<<<<<</=======/>>>>>>>
markers (with diff3 ||||||| support), highlights ours/theirs/base
regions with blended DiffsConflict* highlight groups, provides
resolution keymaps (doo/dot/dob/don) and navigation (]x/[x),
suppresses diagnostics while markers are present, and auto-detaches
when all conflicts are resolved. Fires DiffsConflictResolved user
event on last resolution.
Problem: users who want keybindings must wrap commands in closures.
There is no stable public API for key binding.
Solution: define <Plug> mappings in the plugin file and document them
in a new MAPPINGS section in the vimdoc.
Problem: running :e on a :Gdiff buffer cleared all content because
diffs:// buffers had no BufReadCmd handler. Neovim tried to read the
buffer name as a file path, found nothing on disk, and emptied the
buffer. This affected all three buffer creation paths (gdiff,
gdiff_file, gdiff_section).
Solution: register a BufReadCmd autocmd for diffs://* that parses the
URL and regenerates diff content from git. Change buffer options from
nofile/wipe to nowrite/delete (matching fugitive's approach) so
buffer-local autocmds and variables survive across unload/reload
cycles. Store old filepath as buffer variable for rename support.
Adds du/dU keymaps to fugitive's :Git status buffer for opening unified
diffs instead of side-by-side diffs:
- du opens horizontal split (mirrors dd)
- dU opens vertical split (mirrors dv)
Parses status buffer lines to extract filename and detect section
(staged/unstaged/untracked). For staged files, diffs index vs HEAD.
For unstaged files, diffs working tree vs index.
Configurable via vim.g.diffs.fugitive.horizontal/vertical (set to
false to disable).
Compares current buffer against any git revision (default HEAD), opens result
with full diffs.nvim syntax highlighting. Follows fugitive convention:
:Gdiff/:Gvdiff open vertical split, :Ghdiff opens horizontal split.
