vc-diff works pretty well.