Forked from RohanBhanderi/Git_mergetool_commands
Last active
January 11, 2018 03:29
-
-
Save weiting-tw/0697542bdc14e82a30256bf7435be57a 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 /usr/local/bin/bcomp \"\$LOCAL\" \"\$REMOTE\" | |
| git config --global difftool.prompt false | |
| git config --global merge.tool bc4 | |
| git config --global mergetool.bc4.cmd /usr/local/bin/bcomp \"\$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