So recently I went back vimdiff but haven't really been finding it satisfactory.
If it's that you don't like the diffs, you can configure a different algorithm in vim:
set diffopt+=algorithm:patience
set diffopt+=indent-heuristic
I've previously been using kdiff3 which is pretty good in terms of functionality but I feel that the layout is not optimal, too much screen space is wasted on menubars.
I also missed my vim keybindings in the cases where you have to manually change the text.
So recently I went back vimdiff but haven't really been finding it satisfactory.
What are you using? Any special configurations/plugins?
]]>