Re: Show "Resolved" option in the update dialog

User wrote:
> When using an external merge tool like kdiff3, it will be really useful
> if the "Resolved" option is available in the "Update dialog" when a file
> has conflicted.

You could ask the devs of kdiff3 to implement the resolving: just
deleting the three files you diff is enough.

> The "Resolved" option is available in the "Check for modification"
> dialog or by right clicking directly on the conflicted file in Windows
> Explorer.
> I checked if this option were available in the newest
> TortoiseSVN-1.3-RC1, but it does not seem to be available yet.

Try again. It's available. Of course, only if you have a conflicted file.

Stefan

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