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

Re: [TSVN] Re: Re: TortoiseMerge: Editing conflicts

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-09-27 14:35:30 CEST

Hughes, Bill wrote:

> Another irritation I have with TMerge is that I haven't worked out a way of
> using it from the 'Send To' context menu. With other tools I can select two
> or three files and use 'send to' and the tool automatically runs a diff on
> the arguments supplied.
> Is there a way of doing this with TMerge or does the code have to be change
> to parse the input and use the supplies parameters as base, yours, theirs
> automatically if the '/xxx=' is missing?

Select two files, then in the TSVN submenu choose "diff".
I don't know how this would work for three files, I mean how could you
tell which of the three files is base, theirs and yours?

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 Mon Sep 27 15:37:15 2004

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