[dilippkumar]

> I must say their 3-way merge tool is the best free software on Windows the only competing one, but less good, is p4merge, and it's closed source.

A long time ago, I used Araxis Merge[1] and I can strongly recommend it[2]. It was specifically better than both tortoise git and p4merge, after having used both of those options personally.

[1] https://www.araxis.com/merge/

[2] Assuming you're stuck in a windows development environment - there might be better tools available if you're not on Windows.

[muststopmyths]

Araxis is the best, but not free.

Although if you maintain/contribute to an open source project they will give you a license for free.

[az09mugen]

Thanks for the tip

[az09mugen]

Indeed it seems to be a very good diff tool, plus the fact the license is for life.

But this is not the killer feature that will make me replace tortoise (in fact you can even configure tortoise to use an external diff tool different from theirs).

The killer feature for me is the revision graph [0], and even if tortoise is open source, I can't find something good enough on Linux/MacOS to approach the features of that said revision graph. But once again, please prove me wrong.

[0] : https://stackoverflow.com/a/36338943/6270743