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

TMerge CLI

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2006-02-20 23:03:54 CET

Hi Stefan,

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

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

Is that correct?


   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 Feb 20 23:03:01 2006

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.