Beyond Compare Git Mergetool Settings

From their website:

Diff

Create a shell script file “git-diff-wrapper.sh” with the following content:

  #!/bin/sh
  # diff is called by git with 7 parameters:
  # path old-file old-hex old-mode new-file new-hex new-mode
  "<path_to_bc3_executable>" "$2" "$5" | cat

In a console window enter the command:

  $ git config --global diff.external <path_to_wrapper_script>

3-way Merge (v3 Pro)

In a console window enter the following three commands:

  $ git config --global merge.tool bc3
  $ git config --global mergetool.bc3.cmd "/usr/bin/bcompare \$LOCAL
    \$REMOTE \$BASE \$MERGED"
  $ git config --global mergetool.bc3.trustExitCode true

2-way Merge (v3 Std, v2)

In a console window enter the following three commands:

  $ git config --global merge.tool bc3
  $ git config --global mergetool.bc3.cmd "/usr/bin/bcompare \$LOCAL
    \$REMOTE -savetarget=\$MERGED"
  $ git config --global mergetool.bc3.trustExitCode true

Leave a Reply

Your email address will not be published. Required fields are marked *