Nothing beats Meld for me, but if you're on a remote GUI-less machine, there aren't good options.
https://github.com/jesseduffield/lazygit
(I am not actually sure what a three-way merge conflict is though TBH.)
reply
Nothing beats Meld for me, but if you're on a remote GUI-less machine, there aren't good options.