Back to browse
GitHub Repository

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

263 starsGo

Show HN : ec – terminal nativie Git conflict resolver

by neozz·Apr 16, 2026·1 point·1 comment

AI Analysis

●●SolidNiche GemCozy

Terminal-native 3-way merge TUI when meld and vimdiff already dominate.

Strengths
  • No-args mode auto-lists conflicted files instead of requiring manual file paths.
  • Diff3 base view via git merge-file shows common ancestor for better context.
  • Cross-platform with Homebrew, Nix, AUR, and Windows PowerShell installer support.
Weaknesses
  • Git merge tools are a solved category with meld, kdiff3, and vimdiff established.
  • Doesn't run git add after resolution, requiring extra manual step post-merge.
Target Audience

Terminal-focused developers, Vim/Neovim users

Similar To

meld · vimdiff · kdiff3

Similar Projects