GitHub Desktop – External Diff is the only reason I suffer SourceTreegithub.com/desktop3 pointssurajgupta9 years ago