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

Re: Suggestion: Proceed to the first conflict when "Edit conflicts" is triggered

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 07 Jan 2010 19:47:49 +0100

On 06.01.2010 13:17, Dmitry wrote:
> Hey.
>
> Currently if I select a conflicted file and call "edit conflicts"
> Tortoise Merge is invoked. Inside Tortoise Merge the first difference
> is selected, not the first conflict. This makes no sense - why not
> proceed to the first conflict automatically? Have I missed anything?

Done in r18217.

Stefan 

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2435565
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-01-07 19:48:06 CET

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.