Review only the manual part of a merge commit (conflict resolutions) as native split diffs: committed result vs git's mechanical auto-merge (remerge-diff semantics).
Installation
Launch VS Code Quick Open (Ctrl+P), paste the following command, and press enter.
Review only the manual part of a merge commit — conflict resolutions and evil-merge edits — as native VS Code split diffs, the way JetBrains IDEs separate "merge fix" changes from everything the merge brought in.
Instead of listing files that differ from both parents (JetBrains' combined view), it diffs the committed merge against git's mechanical auto-merge (git merge-tree, same semantics as git show --remerge-diff):
left pane — what auto-merge produced, including <<<<<<< / ======= / >>>>>>> conflict markers;
right pane — what was actually committed;
empty result — the merge was a pure auto-merge with no manual changes.
Files auto-merged cleanly never show up, even when they differ from both parents.
Commands
Merge Resolution: Show Merge Resolution (vs Auto-Merge) — opens the multi-file diff editor.
Merge Resolution: Show Merge Resolution as Patch (remerge-diff) — same content as a unified git show --remerge-diff patch document.
Entry points
Command Palette (works from anywhere; if your clipboard holds a SHA — e.g. via Copy SHA in the GitLens Commit Graph, whose own context menu is not extensible — it appears as the top quick-pick item).
Right-click a commit in GitLens sidebar views (Commits, Branches, Search & Compare).
Right-click a commit in the file Timeline.
A context-menu entry in the built-in Source Control Graph will be added once VS Code finalizes the contribSourceControlHistoryItemMenu API proposal — until then that menu is closed to marketplace extensions.
