isn't difftastic the new way to do this? https://news.ycombinator.com/item?id=39778412

I highly recommend trying it out.