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

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

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-06-25 17:23:02 CEST

Sven Brueggemann wrote:

> 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 :-)

Done in revision 3786.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Jun 25 17:23:24 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.