Guest User

Untitled

a guest
Dec 13th, 2018
87
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. email = 32405690+markcam1@users.noreply.github.com
  9. [push]
  10. default = upstream
  11. [merge]
  12. conflictstyle = diff3
  13. [alias]
  14. co = checkout
  15.  
  16. [core]
  17. autocrlf = input
  18. safecrlf = false
  19. [merge]
  20. tool = kdiff3
  21. [mergetool "kdiff3"]
  22. path = C:/Program Files/KDiff3/kdiff3.exe
  23. trustExitCode = false
  24. [diff]
  25. guitool = kdiff3
  26. [difftool "kdiff3"]
  27. path = C:/Program Files/KDiff3/kdiff3.exe
  28. trustExitCode = false
Add Comment
Please, Sign In to add comment