cvs -z5
diff -up