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

Re: [tortoisesvn] r23280 committed - When resolving a conflict, make TMerge ask for saving modifications on...

From: Oto BREZINA <otik_at_printflow.eu>
Date: Sun, 09 Sep 2012 21:08:41 +0200

On 2012-09-09 14:15, tortoisesvn_at_googlecode.com wrote:
> Revision: 23280
> Author: tortoisesvn
> Date: Sun Sep 9 05:14:17 2012
> Log: When resolving a conflict, make TMerge ask for saving
> modifications on close even if there are no modifications.
> * new command line parameter /saverequired to force the 'save
> modifications' dialog on exit.
> * pass /saverequired to TMerge for situations where a conflict needs to be
> resolved
> (Closes issue #411) : Ask for save when resolving conflicts

Is this actually only saving file or also resolve it ? 

-- 
Oto ot(ik) BREZINA
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3004601
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-09-09 21:09:11 CEST

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.