> next pass of oplock merge. > (It's harder to follow Andrew, then it looks from outside. > Luke did a great job with his big merge.) use dirdiff and if the diffs are just insanely big then indent _both_ files, then after merge, delete the indented version in cvs main, and cvs update. repeat.