News for hackers. Stuff that matters.
Re:Show HN: Version Control for Microsoft Word by TickleSteve on Wednesday June 14, 2017 @03:49PM (#14555518)
the built-in 3-way merge tool will do that... just set it up to be called from your favourite VCS.

There are no comments on this comment yet.