-
-
Save MVoz/697583f0c5e8f1967ca2b43053abd30e to your computer and use it in GitHub Desktop.
Git Mergetool and difftool with Beyond Compare 4
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
//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 (x86)/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 (x86)/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