Have you considered zed instead? What does this offer that zed doesn't?

The diff viewing experience in zed is really polished IMO.