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

Re: TortoiseMerge Help

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2006-09-23 00:11:54 CEST

Stefan Küng wrote:
> Oto BREZINA wrote:
>> In TortoiseMerge is text:
>> <guibutton>Save</guibutton> saves any changes you have made. If you
>> have selected <guilabel>Resolve conflicted Subversion status on
>> save</guilabel> in the settings dialog, then Subversion's conflict
>> working files will be deleted automatically if all conflicts were
>> resolved.
>>
>> Is this option "Resolve conflicted Subversion status on save"
>> available ? I don't found it in GUI nor TortoiseMerge menu. Should I
>> remove it from traslation I'm working on?
>
> Jikes! That option was removed in revision 2671 (feb 16, 2005)!
> I think we have to update our docs :)

Fixed in r7576.

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
Received on Sat Sep 23 00:11:22 2006

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.