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

Re: shift-edit conflicts

From: Stefan Kueng <tortoisesvn_at_gmail.com>
Date: Tue, 06 Jan 2009 21:12:19 +0100

fred hoare wrote:
> I discovered the shift-diff functionality after reading Stefan's blog
> and it works fine for diffs.
> But when I tried to use it for editing conflicts, it always goes to
> the merge editor I have specified in my settings and doesn't use
> TortoiseMerge. Is it possible to enable the shift-editconflicts in
> the same way that shift-diff works?

Filed as issue #430:
http://issues.tortoisesvn.net/index.php?do=details&task_id=430

Stefan

-- 
       ___
  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=1008368
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-01-06 21:13:43 CET

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