Skip to content

Instantly share code, notes, and snippets.

@Guang1234567

Guang1234567/use-bbdiff

Forked from wholmgren/use-bbdiff
Created December 15, 2017 07:43
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Guang1234567/773a4541b2d03b73db9296eabac49201 to your computer and use it in GitHub Desktop.
Save Guang1234567/773a4541b2d03b73db9296eabac49201 to your computer and use it in GitHub Desktop.
Download ZIP
set git difftool to bbdiff
Raw
use-bbdiff
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