Hacker News new | ask | show | jobs
by gofreddygo 719 days ago
For Windows OSes, winmerge [1] has been a solid free alternative to beyond compare for me for years.

[1]: https://winmerge.org
1 comments
xcjs 719 days ago
Did they ever get around to three-way merges? That's a must-have if you use Git as a VCS.
link
gofreddygo 716 days ago
I dont know. I Never use three way merges for anything productive.

Always felt three way merges were a great way to melt human brains.

link
atVelocet 717 days ago
Use VSCode for this. Also has three-way merge.
link