[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: Josha Foust <jfoust_at_mankowindows.com>
Date: 2004-12-21 22:15:24 CET

-----Original Message-----
From: SteveKing [mailto:steveking@gmx.ch]
Sent: Tuesday, December 21, 2004 1:19 PM
To: dev@tortoisesvn.tigris.org
Subject: Re: [TSVN] TortoiseMerge

> 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

Because the right pane is "Yours" and selecting that menu item (the first
one) uses the text from that pane (Yours). The equivalent left pane context
menu just says "Use this text block".

Attached is a combined screen shot of the context menus I get in a
conflicted merge.

Josha Foust

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

tsvn_theirs.JPG
Received on Tue Dec 21 22:16:49 2004

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