I Read 9,000 Lines of a Stranger's Mergetool

Every developer has a merge conflict horror story. Mine usually starts with vimdiff opening four panes of identical-looking code in a terminal window too small to make sense of any of them. I hit :diffget , pray I picked the right buffer number, and repeat until the conflict markers disappear. It works. It has never once felt good. I've tried the GUI tools. Meld, Beyond Compare, VS Code's built-in merge editor. They're fine if you live in a desktop environment, but I spend most of my day in a terminal over SSH. What I wanted was a merge tool that understood git's 3-way conflict model, ran in the terminal, and didn't make me memorize arcane buffer commands just to pick "theirs." So I went looking, and I found one that does exactly that. What Is ec? ec is a terminal-native 3-way git mergetool written in Go by chojs23 . You point it at a file with merge conflicts (or just run ec with no arguments and let it find them) and it opens a TUI with three side-by-side panes: yours, theirs, and th