The Help file details the following regarding the order of the files to be merged in a 3-way merge:
I use the following command line to use Cirrus as the merge tool with TortoiseSVN:
C:\Program Files\Cirrus\Cirrus.exe %mine %base %theirs %merged /lro /rro/ /lefttitle=%mname /centertitle=%bname /righttitle=%tname /outputtitle=%mname
And it definitely gives me Mine on the left, Base in the center, and latest Repository version on the right. And I don't just mean the titles, since I've tested it without specifying the titles. ;-)
Just thought I'd mention this in case the beta help file is incorrect, and could do with being updated.
For a 3-way merge, use:
cirrus.exe <Left File> <Right File> <Center File> <Output File>
However, it seems to me that the order actually goes <Left File> <Center File> <Right File> <Output File>cirrus.exe <Left File> <Right File> <Center File> <Output File>
I use the following command line to use Cirrus as the merge tool with TortoiseSVN:
C:\Program Files\Cirrus\Cirrus.exe %mine %base %theirs %merged /lro /rro/ /lefttitle=%mname /centertitle=%bname /righttitle=%tname /outputtitle=%mname
And it definitely gives me Mine on the left, Base in the center, and latest Repository version on the right. And I don't just mean the titles, since I've tested it without specifying the titles. ;-)
Just thought I'd mention this in case the beta help file is incorrect, and could do with being updated.
Comment