Skip to content

Instantly share code, notes, and snippets.

@dennisdoomen
Created March 16, 2014 09:27
Show Gist options
  • Save dennisdoomen/9580652 to your computer and use it in GitHub Desktop.
Save dennisdoomen/9580652 to your computer and use it in GitHub Desktop.
SemanticMerge git config
[mergetool "semanticmerge"]
keepBackup = false
trustExitCode = false
path = C:/Users/Dennis/AppData/Local/PlasticSCM4/semanticmerge/semanticmergetool.exe
cmd = \"C:/Users/Dennis/AppData/Local/PlasticSCM4/semanticmerge/semanticmergetool.exe\" --base=\"$BASE\" --destination=\"$LOCAL\" --source=\"$REMOTE\" --result=\"$MERGED\" -l=csharp -emt=default -edt=default
[difftool "semanticmerge"]
path = C:/Users/Dennis/AppData/Local/PlasticSCM4/semanticmerge/mergetool.exe
cmd = C:/Users/Dennis/AppData/Local/PlasticSCM4/semanticmerge/mergetool.exe -s=\"$LOCAL\" -d=\"$REMOTE\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment