HN Showcase
Back to browse
GitHub Repository

Easy terminal-native 3-way git mergetool vim-like workflow

263 starsGo

Ec – terminal native 3-way Git mergetool

by neozz·Apr 6, 2026·8 points·0 comments
Visit ProjectView on HN

AI Analysis

●●SolidSolve My ProblemSlick

Finally a mergetool that doesn't force you out of the terminal workflow.

Strengths
  • •3-pane TUI with ours/result/theirs view matches GUI mergetool functionality
  • •Distribution across Homebrew, Nix, AUR, and Go install removes friction
  • •Lazygit integration and Jujutsu support shows real workflow awareness
Weaknesses
  • •Terminal merge tools already exist (vimdiff, meld, kdiff3) with similar features
  • •No automatic conflict resolution suggestions beyond visual comparison
Target Audience

Backend developers and DevOps engineers working in terminal workflows

Similar To

vimdiff · meld · kdiff3

Post Description

ec (easy-conflict) is a 3-way terminal native Git merge conflict resolver. Supports diff3 base comparison, and helps you resolve merge conflicts faster without leaving the terminal.

Similar Projects