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

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

What do you define as BASE? Is it the version you made your original
changes against, or the update you have just received?

You can do this already, it's just not very obvious:

Select MyFile.ext and MyFile.ext.merge-left.rxxx or
MyFile.ext.merge-right.rxxx (depending on which one you consider is
BASE). You now have 2 files selected, and SVN diff appears in the
context menu.

Simon

-- 
       ___
  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