Skip to content

Instantly share code, notes, and snippets.

@include

include/configure git difftool and mergetool to use opendiff in osx

Forked from EstebanMDQ/configure git difftool and mergetool to use opendiff in osx
Created June 14, 2017 10:46
Show Gist options
  • Save include/efe7b0754411ce2cedacb0a24a136079 to your computer and use it in GitHub Desktop.
Save include/efe7b0754411ce2cedacb0a24a136079 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
configure git difftool and mergetool to use opendiff in osx
git config --global diff.tool opendiff
git config --global difftool.opendiff.cmd 'opendiff "$LOCAL" "$REMOTE"'
git config --global merge.tool opendiff
git config --global mergetool.opendiff.cmd 'opendiff -merge "$MERGED" "$LOCAL" "$REMOTE"'
git config --global mergetool.opendiff.trustExitCode false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment