Hacker News new | ask | show | jobs
by politician 1554 days ago
It remains the best option for 3-way merge. For diff, I find myself just reading the raw diff output.
1 comments
vlovich123 1554 days ago
Works fine for 2-way diffs too
link