Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
[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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment