Neovim Merge Diff Plugin

A Neovim plugin to show diff between merge conflicts.

Features

• Automatic conflict detection on file open
• Diff3 support (shows base/ancestor)
• Works with standard merge conflicts (no diff3)
• Floating window diff display

Commands

Command	Description
:MergeDiffOurs	Show diff of ours → base (diff3 only)
:MergeDiffTheirs	Show diff of theirs → base (diff3 only)
:MergeDiffBoth	Show both diffs in floating window (diff3 only)
:MergeDiffOursTheirs	Show diff ours → theirs (works without diff3)
:MergeDiffTheirsOurs	Show diff theirs → ours (works without diff3)

Installation

Using lazy.nvim

{
  "nvim-merge-diff",
  config = function()
    require("merge-diff").setup()
  end,
}

Manual Installation

1. Clone this repository to your plugin directory
2. Run :MergeDiffSetup to configure

Configuration

require("merge-diff").setup({
  -- Marker patterns (default)
  markers = {
    ours = "^<<<<<<<+",
    theirs = "^>>>>>>>+",
    ancestor = "^|||||||+",
    separator = "^=======+$",
  },
})

Usage

1. Open a file with merge conflicts
2. Position cursor on any line within the conflict
3. Run any :MergeDiff* command

Requirements

• Neovim 0.10+
• diff command (optional: delta for better formatting)