In my svn commit of 329494, when I went to merge it to the branch I got a conflict on every line of the change - all eol issues.
My questions are: 1) did I just get unlucky with my timing vs. the recent eol mass change? 2) Did I do something wrong with my original checkin, or something with the merge command (kathy tried the merge and got the same conficts)? 3) Is this going to happen with all future trunk to branch merges?
