Hacker News new | ask | show | jobs
by tored 709 days ago
I use WinMerge for that, unfortunately, as the name implies, Windows only.
1 comments
ubercow13 709 days ago
I don't think WinMerge supports proper 3 way merge..
link