Re: TMerge CLI

Simon Large wrote:

> In the app automation section for TMerge you state that both /base and
> /mine are used to specify the left file in 2-way diffs. Looking at what
> actually gets passed to the program, I think this should be
>
> 2-way diff:
> /base - left pane
> /mine - right pane

or
/base - left pane
/theirs - right pane

or
/mine - left pane
/theirs - right pane

maybe we should just call that 'first' and 'second' file instead of left
and right?

> 3-way diff:
> /theirs - left pane
> /mine - right pane
> /merged - bottom pane
> /base - base file used to generate the diffs.
>
> Also /basename is passed in 3-way mode but does not seem to be displayed
> anywhere.
>
> Is that correct?

Check the docs :)
/basename really isn't shown directly, but it is shown in the tooltip of
the two top views in three-way merge. Because those views are the diffs
between mine/base and theirs/base.

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