On Wednesday, June 6, 2018 at 12:10:56 PM UTC-5, Stefan wrote: > > 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. >
Stefan, Please note in the screenshot that ALL lines are not the same (in effect in conflict) but only some show the red conflict color. The lines there are identical except for line number. Something else must be going on. Again this was working fine in 1.9 Turning on this filter would remove all conflicts except lines that were changed in other than the line number area. Thanks for your time, Scott -- 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/5bbc8a46-ec46-4a05-91ec-dfff5c12c729%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
