@obrhoff even though it isn’t native on macOS, I’ve been using GitKraken because it has the best - in my opinion of course - built-in diff/merge tool among the GIT GUI clients I’ve tested so far.