> > 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. >
in that case, the conflict usually is in whitespace or even line-endings. click the "show whitespace" button and you might see some conflicts. Stefan -- 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/a6756b98-0db9-4c85-a148-4c83957342d4%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
