I've been using `git difftool` and `ksdiff` for more than half a year now and it works perfectly.