Skip to content

Instantly share code, notes, and snippets.

@seathief

seathief/Git_mergetool_commands

Forked from RohanBhanderi/Git_mergetool_commands
Last active December 9, 2021 08:51
Show Gist options
  • Save seathief/912479d0da40115416fae4ac9cbd180c to your computer and use it in GitHub Desktop.
Save seathief/912479d0da40115416fae4ac9cbd180c to your computer and use it in GitHub Desktop.
Download ZIP
Git Mergetool and difftool with Beyond Compare 4
Raw
Git_mergetool_commands
//Git Mergetool and difftool with Beyond Compare 4
//Install command line tools
//For osx
//IF running this command in git bash then escape $ with \
git config --global diff.tool bcomp
git config --global difftool.bcomp.cmd "\"bcomp\" \"\$LOCAL\" \"\$REMOTE\""
git config --global difftool.prompt false
git config --global merge.tool bcomp
git config --global mergetool.bcomp.cmd "\"bcomp\" \"\$LOCAL\" \"\$LOCAL\" \"\$REMOTE\" \"\$BASE\" \"\$MERGED\""
git config --global mergetool.bcomp.trustExitCode true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment