#merge tool
Merge Studio — 3-Way Merge & Conflict Resolver
gitstudio
A beautiful 3-way merge conflict editor for VS Code & Cursor: resolve conflicts with color ribbons and one-click accept arrows, a conflicts dashboard, undo history, and a precise side-by-side diff — with optional one-click hand-off to an installed JetBrains IDE.
SCM Providers
#git
335
5.0
Diff Checker Pro - Compare Text & Files Side-by-Side
theabhishekjaiswal
Compare texts, files, and clipboards easily. Features side-by-side/inline comparison, word-level highlights, two-way accept changes, resizable panels, and ignore options (whitespace/case).
Formatters
Visualization
#diff
76
5.0
MergePro
ismailcherri
IntelliJ-style three-pane merge conflict resolver for VS Code.
SCM Providers
#git
31