“It might even help you to figure out what’s going on in that merge you keep avoiding.”
Two and three-way diffs of files, folders and version-controlled projects, free and open source. It runs on Linux and Windows. Mac support is still “semi-official,” so Mac users get builds from Homebrew and MacPorts. A visual diff beats squinting at conflict markers in a terminal every time.