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

Re: [TSVN] Resolve conflict request feature

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-01-12 19:32:49 CET

Rainer Müller wrote:
> Will Dean wrote:
>
>> You can set an option in TMerge to do this for you when you save the
>> merged file. Have a look in the TMerge settings.
>
>
> I would prefer a toolbar button "Mark as resolved". This would be much
> better than resolve on save. That wouldn't be much work to integrate,
> would it?

If you can send me an icon to use for that, I guess it would take an
hour or so.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jan 12 19:33:23 2005

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