I've been a programmer for 30 years, so yeah I follow all that. I'm spoiled because I work in Visual Studio most of the time. My comments above were completely unnecessary, and the following is just chit chat too.
I've done quite a few big merges using Team Foundation and SourceSafe - the diff tools and SC are mostly the same as anything else. My opinion on big merges is they should be done by one person, and everyone else should be locked out during that time. In the past, when I've done it, I've basically gone through all the branches and auto-formatted the code - to any style as long as all the files were the same. Then the merge is a little easier, but you still need someone who knows the system very well, who can make decisions when there is conflicting code.
I can read code of any style as long as it's not minimized or obfuscated or something like that. In jobs, when this situation arises, I usually defer to the younger developers and let them have things the way they want, because they are much more hampered by style issues than I am.
I generally agree with RobD comments above though... I agree with him on tabs vs. spaces, I personally prefer opening braces on the declaration line and closers on their own line, but I agree with the reasoning given to leave it how it is. I prefer that openers on the declaration line because it allows me to see more code on the screen - same thing for empty lines, they are a nice way to break up pseudo-blocks, but there should never be more than one blank line in a row. Because most of us work with color-coded editors, I prefer no blank lines after comments - prefer the comment to be grouped with the thing it's about. These are just personal preferences, mostly chosen because they allow me work faster, but they don't affect the logic, so they are not that big a deal overall.