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.
Show HN: Ec – terminal native 3-way Git mergetool
1–1 of 1 posts