This looks like a change I made, but I do merges, and looking at the cvs diff its likely that this is what I thought the result should be. I guess the real issue here is that if there are differences in the files that should be maintained across merges that these be better documented. There should also probably be a note in a notification forum is a potentially conflicting change is made just to bring it to everyones attention.
In this case there was no reason why jboss-3.2.x wasn't in synch with jboss4
But I think it is infeasable to try to record which sources differ between 3.2.x
and jboss 4.
Even if we did, I can guarantee it wouldn't be maintained accurately or always referred to.
This is the purpose of cvs diff anyway.