TMerge conflict resolution

Hi Stefan,

I'm looking at documenting changes to TMerge and I made a note about a
new icon to indicate resolved conflicts. I can't see that in r11125,
although I can see the green background for resolved lines.

Also, in the resources there is a lineconflictedignored.ico which I
have never seen, and can't see when it might be used.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org