[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: TMerge conflict resolution

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-10-29 10:24:37 CET

Simon Large wrote:
> 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.

There is no special icon for resolved conflicts.

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

That's the icon which is shown for lines which *would* be in conflict
but are not due to some TMerge settings (e.g., ignore line endings,
ignore spaces, ...).
This is to help the user when e.g., during an update a conflict occurs,
but TMerge doesn't show one.


   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
Received on Mon Oct 29 10:24:54 2007

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.