I wish there were a good TUI for handling merge conflicts. Vimdiff seems to be the closest, but doesn't have keyboard bindings for 3-way merges.
Nothing beats Meld for me, but if you're on a remote GUI-less machine, there aren't good options.
replies(2):