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

Re: Suggestion: include command lines for some common third-party merge tools

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-10-23 17:20:54 CEST

Fernando P. Nájera Cano wrote:
> These are my settings for Araxis and I'm so happy with them...
> Diffs:
> compare.exe /max /wait /title1:%bname /title2:%yname %base %mine
>
> Merges:
> compare.exe /max /wait /3 /title1:%tname /title2:%bname /title3:%yname
> %theirs %base %mine %merged /a2

Thanks Fernando,

Added in r4731.

Simon 

-- 
        ___
   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 Sun Oct 23 17:21:25 2005

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.