#
merge-editor
Here are 3 public repositories matching this topic...
A modern merge editor for the Web
-
Updated
Aug 19, 2024 - TypeScript
The merge editor for VS Code and Cursor — a real three-pane merge editor with color ribbons, a conflicts dashboard, undo history, and a side-by-side diff.
git merge-conflicts conflict-resolution diff jetbrains vscode-extension cursor diff-tool merge-tool three-way-merge merge-editor
-
Updated
Jun 24, 2026 - TypeScript
Improve this page
Add a description, image, and links to the merge-editor topic page so that developers can more easily learn about it.
Add this topic to your repo
To associate your repository with the merge-editor topic, visit your repo's landing page and select "manage topics."