great stuff! would love to see this integrated into Lazygit, which I've found the best TUI git tool overall but doesn't have as good of a conflict resolution UX as you've done here (or JetBrains, which is the gold standard in GUI tools, IMO).

I use Lazygit too! If you configure ec as git mergetool, you can resolve conflict via ec by open external mergetool in Lazygit.