I have followed the instructions for calling BC3(here ). My issue is that when I choose to Merge (Reintegrate a branch), Tortoise's "Edit Conflict" button is grayed out. The button is available if I choose to use Tortoise's diff utility. I am trying to diff excel files if that makes a difference.
BC 3.2.4 trial version
TortoiseSVN 1.6.6 on SVN 1.6
Excel files are .xls from Excel 2003
BC 3.2.4 trial version
TortoiseSVN 1.6.6 on SVN 1.6
Excel files are .xls from Excel 2003
Comment