4 ms·Show HN: Ec – terminal native 3-way Git mergetool8 points by neozz 6mo agoec (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.