the regex filter is only that: a filter. It does not change the file before diffing but simply makes TMerge not show the differences while viewing. That means the conflict still exists.
-- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/87f53791-93cd-450b-a10d-c18cebe2f31d%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
