Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- #!/usr/bin/env bash
- # Configure git to use diffmerge as the difftool and mergetool
- git config --global difftool.prompt false
- git config --global diff.tool diffmerge
- git config --global difftool.diffmerge.cmd "/usr/local/bin/diffmerge --nosplash \"\$LOCAL\" \"\$REMOTE\""
- git config --global merge.tool diffmerge
- git config --global mergetool.diffmerge.trustExitCode true
- git config --global mergetool.diffmerge.cmd "/usr/local/bin/diffmerge --nosplash --merge --result=\"\$MERGED\" \"\$LOCAL\" \"\$BASE\" \"\$REMOTE\""
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement