On Tue, 29 May 2001, [EMAIL PROTECTED] wrote: > This won't work. You are checking for ^<<<<<<<$ and ^>>>>>>>$, > which will only match if the angle brackets are the only > characters on the line (which they weren't in the conflict I fixed > earlier today). I think you need to allow for the filename or the > version number to appear at the end of the line.
That's true, I just copied/merged the code... :-) But I think removing dollar signs from the end of lines is enough good solution. -- Tommi Vainikainen
