-
-
Save ThuanNP/f1d125756ab684c6fadcbe19e182df94 to your computer and use it in GitHub Desktop.
set git difftool to bbdiff
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 config --global diff.tool bbdiff | |
git config --global difftool.bbdiff.cmd 'bbdiff --wait --resume "$LOCAL" "$REMOTE"' | |
git config --global difftool.prompt false | |
git config --global merge.tool bbdiff | |
git config --global mergetool.bbdiff.cmd 'bbdiff --wait --resume "$LOCAL" "$REMOTE"' | |
Double check ~/.gitconfig |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment