Hi,
I am using TortoiseSVN and one of the feature I really like is, if there is a conflict, they let you use the Edit Conflict (TortoiseSVN > Edit Conflict... in the context menu) feature to resolve any conflict between two versions. The only issue is whenever I want to use it, it works great for text files with TortoiseMerge application but every time I use Excel or Word document, I get the following error:
I downloaded beyond compare 4 but not sure how to set it up to open the files with BC4 rather than TortoiseMerge.
Please help.
I am using TortoiseSVN and one of the feature I really like is, if there is a conflict, they let you use the Edit Conflict (TortoiseSVN > Edit Conflict... in the context menu) feature to resolve any conflict between two versions. The only issue is whenever I want to use it, it works great for text files with TortoiseMerge application but every time I use Excel or Word document, I get the following error:
The file '??????/file.xslx' is not a valid text file!
I downloaded beyond compare 4 but not sure how to set it up to open the files with BC4 rather than TortoiseMerge.
Please help.
Comment