Allow Beyond Compare For Merge Conflicts

The desktop app doesn’t work with Beyond Compare for merge conflicts

I have the following settings in my gitconfig file.

[merge]
  tool = BeyondCompare4
[diff]
  guitool = beyondcompare4
[difftool "beyondcompare4"]
  path = C:/Program Files/Beyond Compare 4/bcomp.exe
  cmd = \"C:/Program Files/Beyond Compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
[mergetool "BeyondCompare4"]
  path = C:/Program Files/Beyond Compare 4/bcomp.exe
  cmd = \"C:/Program Files/Beyond Compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"

These settings allow Beyond Compare as a merge tool in other Git clients.

When I need to resolve merge conflicts in the desktop application, it opens VS Code. This is set under options -> integrations -> applications and does not allow for Beyond Compare or other 3rd party tools for merging.

Proposed solution

Allow for Beyond Compare and other 3rd party applications to be used for merge conflicts. I have to use a different source control tool when I have merge conflicts.

[owenwp]

Why not just support whatever merge tool the user already has configured in .gitconfig? A simple option to run the “git mergetool” command would fix this.

[anarten]

I would second this and also suggest TortoiseGit as another editor. https://tortoisegit.org/