Do you review your own changes, or someone else's? Asking because the former is unusual, but the latter works much better with OxygenXML's built-in change tracking. It's fantastic for working with editors (in combination with, say, Subversion).
Both. Also, I have sometimes a doc edited on google docs, then copied over to local file and formatted in asciidoc. After that we put it back to the google doc in asciidoc markup, and subsequent comparison and merging becomes a way lot simpler.
