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

Re: TMerge edit menu

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 13 May 2008 18:06:55 +0200

Simon Large wrote:
> Hi Stefan,
>
> What is the difference between 'Use left block' and 'Use text block
> from "theirs"', and the other three menu entries which seem like
> duplicates? You get either one or the other in the context menu, but
> having both in the main menu just seems confusing.

They're not really duplicates. They're actually completely different
functions: the first ones are for two-way diffs, the second ones for
three-way merging.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-05-13 18:07:25 CEST

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.