2015-02-20 10:59 AEST by Arthur Barrett - Apparently SVN puts conflict markers in the updated/merged file, PLUS a copy of your original, pre-
conflict file, PLUS the version that came down from the server, PLUS the version that you were originally 
editing.

ie:
'cvs update blah.txt'

does:
copy blah.txt blah-edited.txt
copy server:blah.txt(current sandbox revision) blah-server.txt
copy server:blah.txt(HEAD of branch revision) blah-new.txt
merge blah.txt blah-new.txt

The 'blah.txt(current sandbox revision)' is actually already available in CVS\Base (if that feature is 
enabled).