Hacker News new | ask | show | jobs
by TickleSteve 3293 days ago
the built-in 3-way merge tool will do that... just set it up to be called from your favourite VCS.