Advertisement
Guest User

Untitled

a guest
May 26th, 2016
60
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.51 KB | None | 0 0
  1. #!/usr/bin/env bash
  2.  
  3. # Configure git to use diffmerge as the difftool and mergetool
  4.  
  5. git config --global difftool.prompt false
  6.  
  7. git config --global diff.tool diffmerge
  8. git config --global difftool.diffmerge.cmd "/usr/local/bin/diffmerge --nosplash \"\$LOCAL\" \"\$REMOTE\""
  9.  
  10. git config --global merge.tool diffmerge
  11. git config --global mergetool.diffmerge.trustExitCode true
  12. 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