Guest User

Untitled

a guest
Jun 18th, 2018
99
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.51 KB | None | 0 0
  1. [diff]
  2. tool = winmerge
  3. external = "'C:/Program Files (x86)/WinMerge/WinMergeU.exe'" -e -u -dl "Base" -dr "Mine" "$2" "$5"
  4.  
  5. [difftool "winmerge"]
  6. cmd = "'C:/Program Files (x86)/WinMerge/WinMergeU.exe'" -e -u -dl "Base" -dr "Mine" \"$LOCAL\" \"$REMOTE\"
  7.  
  8. [difftool]
  9. prompt = false
  10.  
  11. [merge]
  12. tool = winmerge
  13.  
  14. [mergetool "winmerge"]
  15. cmd = "'C:/Program Files (x86)/WinMerge/WinMergeU.exe'" -e -u -dl "Local" -dr "Remote" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
  16. trustExitCode = true
  17.  
  18. [mergetool]
  19. keepBackup = false
  20. prompt = false
Add Comment
Please, Sign In to add comment