Hacker News new | ask | show | jobs
Show HN: Ec – terminal native 3-way Git mergetool (github.com)
8 points by neozz 69 days ago
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.