Guest User

Untitled

a guest
Dec 13th, 2018
95
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.56 KB | None | 0 0
  1. [filter "lfs"]
  2. required = true
  3. clean = git-lfs clean -- %f
  4. smudge = git-lfs smudge -- %f
  5. process = git-lfs filter-process
  6. [user]
  7. name = markcam1
  8. [push]
  9. default = upstream
  10. [merge]
  11. conflictstyle = diff3
  12. [alias]
  13. co = checkout
  14.  
  15. [core]
  16. autocrlf = input
  17. safecrlf = false
  18. [merge]
  19. tool = kdiff3
  20. [mergetool "kdiff3"]
  21. path = C:/Program Files/KDiff3/kdiff3.exe
  22. trustExitCode = false
  23. [diff]
  24. guitool = kdiff3
  25. [difftool "kdiff3"]
  26. path = C:/Program Files/KDiff3/kdiff3.exe
  27. trustExitCode = false
Add Comment
Please, Sign In to add comment