Skip to content

Instantly share code, notes, and snippets.

@isao

isao/use-bbdiff

Forked from wholmgren/use-bbdiff
Created January 21, 2021 19:07
Show Gist options
  • Save isao/a6f511d79f9e60f008f1ac745e3b4c50 to your computer and use it in GitHub Desktop.
Save isao/a6f511d79f9e60f008f1ac745e3b4c50 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