meld
Meld, in your terminal — faithful TUI port of the Meld diff/merge tool: 2/3-way file merge, folder compare, VC view, git mergetool, over plain SSH