Tracked changes show up in bright red, blue, and green colors. Difficult to miss, as long as you don't hide them. There are also ways to ensure that a "final" r

Tracked changes show up in bright red, blue, and green colors. Difficult to miss, as long as you don't hide them. There are also ways to ensure that a "final" revision of a document is saved. The hidden versioning I talked about are attributes on elements in the XML version of documents that are not normally displayed. They contain a random number that distinguish text edited in different "blocks" from each other -- making it possible to determine how to combine different versions of text, without containing full version history (and thus leaking information like in your example). It's not as good as a recursive three-way merge that git has, but it's reasonably effective when combining documents. You are right that it doesn't separate the content from the history -- but keeping full history and keeping things private are at odds with each other anyway. Consider the outrage when people rediscovered the Fast Save feature -- it was very useful, but it also leaked potentially sensitive information in a way people didn't expect. http://support.microsoft.com/kb/197978 http://support.microsoft.com/kb/197978 http://news.cnet.com/8301-10784_3-9780073-7.html http://news.cnet.com/8301-10784_3-9780073-7.html