>Thanks. This is good to know!
>
>Is the merge seamless/easy to use? What would happen, in the case of a procedure library, if two developers ended up working on the same procedure? Is VSS 'procedure aware'?
>

I wouldn't call it "seamless", but it's not too bad. It displays the original file on one side and the changed file on the other. Differences between the two are highlighted and you can accept the changes you want. VSS doesn't know/care about the underlying language constructs (it's language neutral), so no, it's not procedure aware. Checking out the same file for changes and having to merge two changed files back together isn't something I'd want to do on a regular basis, but it's reasonably easy if the developer is paying attention.