Advertisement
Guest User

Untitled

a guest
Aug 27th, 2015
229
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.70 KB | None | 0 0
  1. [filter "lfs"]
  2. clean = git-lfs clean %f
  3. smudge = git-lfs smudge %f
  4. required = true
  5. [user]
  6. name =
  7. email =
  8. [core]
  9. autocrlf = true
  10. excludesfile = C:\\Users\\cbjugstad.INTEL\\Documents\\gitignore_global.txt
  11. [merge]
  12. tool = p4merge
  13. [diff]
  14. tool = p4merge
  15. [difftool "p4merge"]
  16. cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$LOCAL\" \"$REMOTE\"
  17. [mergetool "p4merge"]
  18. cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
  19. trustExitCode = true
  20. [difftool "sourcetree"]
  21. cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$LOCAL\" \"$REMOTE\"
  22. [mergetool "sourcetree"]
  23. cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
  24. trustExitCode = true
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement