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

Re: [TSVN] TortoiseMerge

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-12-21 20:18:51 CET

Josha Foust wrote:
> I am still seeing the “Use text block from “theirs”” on the right pane
> when editing conflicts.

And why is that wrong? If you edit a conflict, the left pane is called
"theirs", so "Use text block from "theirs"" is the correct label for
that menu entry.
Or did I get you wrong here?

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 Dec 21 20:23:35 2004

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.