On Wednesday, June 6, 2018 at 2:19:36 PM UTC-5, Stefan wrote: > > 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 >
As noted in the above screen shot we had Whitespace shut off we also ran it again with Show whitespace and no issues were seen. We have switched over to using Beyond Compare in place of Tmerge for the time being. -- 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/259dfe05-764c-43ef-ac26-13ae5d2ce8ea%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
