Git diffs & merges, but nicer
Native macOS app for browsing commits, comparing branches, viewing file history and resolving conflicts with a powerful 3-way merge tool.