Well, Word can diff and merge documents, though, it works with sharepoint, not vcs.

Reply via email to