Hacker News new | ask | show | jobs
by ubercow13 712 days ago
I don't think WinMerge supports proper 3 way merge..