Hacker News new | ask | show | jobs
by atVelocet 719 days ago
Use VSCode for this. Also has three-way merge.