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

[TSVN] No menu entry "Diff" for conflicted files

From: Sven Brueggemann <SBrueggemann_at_gmx.net>
Date: 2005-06-24 21:49:35 CEST

Hello,

although TortoiseMerge is the best merging tools I've seen
so far, I'm still not very familiar with the way it visualizes
differences.

So when having edited a conflict with TortoiseMerge, I'm more
convinced to mark the conflict resolved after diffing the file
against BASE with my favorite editor.

Unfortunately there's no "Diff" entry in a conflicted files'
context menu.

Of course I can diff against BASE after marking the conflict
resolved, but that might be too late...

If there are others around that would like to diff a conflicted
file, I'd like to request this feature to be added. Otherwise,
simply ignore my mail :-)

Kind regards

Sven

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jun 24 21:49:49 2005

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.