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

Re: [TSVN] Diff on conflicted file

From: Stefan Küng <stefan.kueng_at_wagner-group.ch>
Date: 2004-09-14 10:17:27 CEST

Simon Large wrote:
> If you do a context-menu diff on a conflicted file, all the conflict markers
> show up as changes in the WC. Should diff be disabled for conflicted files?

As of revision 1685, TSVN won't show the diff command for conflicted
files anymore.

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 Tue Sep 14 11:23:17 2004

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