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

Re: Merge Conflict Callback Dialog does NOT show during Reintegrate a branch

From: Tobias Schäfer <tobiasschaefer_at_gmx.de>
Date: Thu, 18 Dec 2008 17:23:11 +0100

On Thursday 18 December 2008 17:18:37 jm legrand wrote:
> Hi,
>
> In which release of TortoiseSVN the bug (fixed in r14439) will be
> integrated?

This has been fixed in the trunk of TortoiseSVN but not merged to 1.5.x, so
it will be included in the upcoming 1.6.0 release.

Tobias 

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=986787
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2008-12-18 17:23:34 CET

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

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