[tomovo]

Now I've got to mention Sublime Merge as my personal favorite: super fast, nice clean UI on all platforms, still maintained, single purchase license.

[have_faith]

Big fan of sublime merge. I recommend it a lot to people who need to dip their toes in source control and want some layer of abstraction, but also want to feel like they’re connected to the underlying tool (git). Merge balances this very well.

[petesergeant]

It’s a fantastic tool, and although I’m very comfortable on the command line, I always reach for Sublime Merge

[tombert]

I know a lot of devs hate on Perforce (and I am no exception), but I've grown to actually really like p4merge (the Perforce merge tool) for handling conflicts.

It's a bit of an odd one, and it has a bit of a learning curve, but it's free (as in beer), relatively easy to install, and seems to work well for me. I haven't found a FOSS tool that I like as much yet.

[neves]

Kdiff3 used to be great. Had a stable and outdated interface.

Now that they updated the interface I've had problems. Ch l crashes and difficulty to install as non admin.

[tombert]

I don't think I've actually used Kdiff3. I always assumed that it was Linux only but apparently I was objectively wrong about that. I should give it a shot.