Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- [diff]
- tool = semanticmerge
- [difftool "semanticmerge"]
- cmd = \"C:\\Users\\User\\AppData\\Local\\semanticmerge\\semanticmergetool.exe\" -s \"$LOCAL\" -d \"$REMOTE\"
- [difftool]
- prompt = false
- [merge]
- tool = semanticmerge
- [mergetool "semanticmerge"]
- cmd = \"C:\\Users\\User\\AppData\\Local\\semanticmerge\\semanticmergetool.exe\" -s \"$LOCAL\" -d \"$REMOTE\" -b \"$BASE\" -r \"$MERGED\"
- prompt = false
- keepBackup = false
- trustExitCode = true
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement