Masatake YAMATO <[EMAIL PROTECTED]> writes: >> Has anyone else ever noticed that some lines have been duplicated after >> merging? I merged in Stefan's big patch with star-merge and then found >> a whole lot of stuff had been duplicated, so I tried a replay instead >> and found that it generated more conflicts but fewer duplicates. > > Something to do with tab/space issue? > > In HACKING: > > Coding style > ============ > > ...Please, strip trailing whitespaces from your source files.
Hm... the two versions of the code appear to be the same (both use spaces and neither has trailing space). I'll keep poking around I guess :o) Mark -- Mark Triggs <[EMAIL PROTECTED]>
