Guest User

Untitled

a guest
Nov 19th, 2017
79
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.66 KB | None | 0 0
  1. [filter "lfs"]
  2. clean = git-lfs clean -- %f
  3. smudge = git-lfs smudge -- %f
  4. process = git-lfs filter-process
  5. required = true
  6. [user]
  7. name = <USERNAME>
  8. email = <EMAIL>
  9. [mergetool]
  10. prompt = false
  11. keepBackup = false
  12. keepTemporaries = false
  13. [merge]
  14. tool = winmerge
  15. [mergetool "winmerge"]
  16. name = WinMerge
  17. trustExitCode = true
  18. cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e -dl \"Local\" -dr \"Remote\" $LOCAL $REMOTE $MERGED
  19. [diff]
  20. tool = winmerge
  21. [difftool "winmerge"]
  22. name = WinMerge
  23. trustExitCode = true
  24. cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e $LOCAL $REMOTE
  25. [core]
  26. editor = code --wait
Add Comment
Please, Sign In to add comment