Consider the case where you have one file, you start tracking changes, and you send the file to person X. X do stuff and send you the file back, now it's possible to see the changes, but what if you can't be sure X hasn't messed it up in someway? Accepting X's own changes? Is it possible to keep your file as the "master" and then do something like "import changes from other file"?
Gunnar.
