Skip to content

Instantly share code, notes, and snippets.

@segilbert

segilbert/semanticmerge.gitconfig

Created April 24, 2017 16:06
Show Gist options
  • Save segilbert/f6c5f6f32e7b48063fb5e84d5d47f1ae to your computer and use it in GitHub Desktop.
Save segilbert/f6c5f6f32e7b48063fb5e84d5d47f1ae to your computer and use it in GitHub Desktop.
Download ZIP
Raw
semanticmerge.gitconfig
[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