merge-editor

Here are 3 public repositories matching this topic...

A modern merge editor for the Web

editor diff svelte merge mismerge merge-editor web-merge-editor

Modern TUI merge tool and interactive diff editor for Jujutsu (jj) and Git

git diff tui jj diff-tool merge-editor jujutsu

JetBrains-style 3-way merge editor & diff for VS Code and Cursor — conflicts dialog, gutter ribbons, undo history, and optional real-IDE integration

git merge-conflicts diff jetbrains vscode-extension merge-editor

Add a description, image, and links to the merge-editor topic page so that developers can more easily learn about it.

To associate your repository with the merge-editor topic, visit your repo's landing page and select "manage topics."