user2636464
user2636464

Reputation: 735

clearcase merge with beyond compare

I have few xml files to merge in clearcase and its not working with default tool. so, I made changes to map file to use beyond compare 3 as the merge and compare tools. I am not sure now how to merge xml files and it shows only two windows and an option as copy to the right. can someone help here?

Upvotes: 1

Views: 537

Answers (1)

VonC
VonC

Reputation: 1324327

First, check your settings: map file for ClearCase 7 or more.

text_file_delta xcompare    C:\Program Files (x86)\Beyond Compare 4\BComp.exe
text_file_delta xmerge  C:\Program Files (x86)\Beyond Compare 4\BComp.exe

Second, make sure to use Beyond Compare 3 or 4.

Third, as far as I can see, the three-way merge illustrated here is only for the pro version, not the standard one.

https://www.scootersoftware.com/images/TextMerge.png

Upvotes: 1

Related Questions