Skip to content

Instantly share code, notes, and snippets.

@sliekens

sliekens/Git_mergetool_commands

Forked from RohanBhanderi/Git_mergetool_commands
Created November 10, 2017 10:16
Show Gist options
  • Save sliekens/b6e539cecfc9e1e059ff6fa0777a8c32 to your computer and use it in GitHub Desktop.
Save sliekens/b6e539cecfc9e1e059ff6fa0777a8c32 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
//For Windows
//IF running this command in git bash then escape $ with \
git config --global diff.tool bc4
git config --global difftool.bc4.cmd "\"C:/Program Files/Beyond Compare 4/BCompare.exe\" \"\$LOCAL\" \"\$REMOTE\""
git config --global difftool.prompt false
git config --global merge.tool bc4
git config --global mergetool.bc4.cmd "\"C:/Program Files/Beyond Compare 4/BCompare.exe\" \"\$LOCAL\" \"\$REMOTE\" \"\$BASE\" \"\$MERGED\""
git config --global mergetool.bc4.trustExitCode true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment