minimizing merge conflicts

[jak]

Is anyone aware of an open source tool that can reformat C++ source
per some definable standard? Ideally, this could be something executed
by make as part of the build process.

I work on a multideveloper team and invariably code gets reformatted
as developers are using different editors or simply like to move
things around whenever they get into a file. My assumption is that
this will make cvs' work more complicated when merging resulting in it
reporting a conflict when there really isn't one. Admittedly, I
haven't actually seen this happen yet, but believe that it was alluded
to as a possibility in this news group. 

Thanks,
John