Hacker News new | past | comments | ask | show | jobs | submit login

it is positively ancient, but KDiff3 is still my go-to: https://sourceforge.net/projects/kdiff3/



Definitely not the best looking app, but KDiff3 is the best one I’ve found that can do a 4-panel 3-way merge, i.e. showing original, left, right, and merged.




Consider applying for YC's Spring batch! Applications are open till Feb 11.

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: