I posted updated instructions for using BC3 for Linux as a diff and merge tool with Git in our knowledgebase article Using Beyond Compare with Version Control Systems.
The previous instructions worked correctly for diff, but required a small change to work correctly for merge. Once configured following the instructions at the above link, you can launch a merge in BC3 using the command "git mergetool filename.txt".
The system used to test the instructions was running Ubuntu 9.0.4, Git 1.6.0.4, and BC3 for Linux 3.1.3.
The previous instructions worked correctly for diff, but required a small change to work correctly for merge. Once configured following the instructions at the above link, you can launch a merge in BC3 using the command "git mergetool filename.txt".
The system used to test the instructions was running Ubuntu 9.0.4, Git 1.6.0.4, and BC3 for Linux 3.1.3.
Comment