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

shift-edit conflicts

From: fred hoare <fred.hoare_at_redprairie.com>
Date: Tue, 6 Jan 2009 02:00:18 -0800 (PST)

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?

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1007237

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-01-06 11:01:28 CET

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