Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- [diff]
- tool = winmerge
- external = "'C:/Program Files (x86)/WinMerge/WinMergeU.exe'" -e -u -dl "Base" -dr "Mine" "$2" "$5"
- [difftool "winmerge"]
- cmd = "'C:/Program Files (x86)/WinMerge/WinMergeU.exe'" -e -u -dl "Base" -dr "Mine" \"$LOCAL\" \"$REMOTE\"
- [difftool]
- prompt = false
- [merge]
- tool = winmerge
- [mergetool "winmerge"]
- cmd = "'C:/Program Files (x86)/WinMerge/WinMergeU.exe'" -e -u -dl "Local" -dr "Remote" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
- trustExitCode = true
- [mergetool]
- keepBackup = false
- prompt = false
Add Comment
Please, Sign In to add comment