Skip to content

Instantly share code, notes, and snippets.

@AliceWaddicor

AliceWaddicor/Full Git config for SemanticMerge

Created August 8, 2014 17:07
Show Gist options
  • Save AliceWaddicor/a8040765c2372f32098d to your computer and use it in GitHub Desktop.
Save AliceWaddicor/a8040765c2372f32098d to your computer and use it in GitHub Desktop.
Download ZIP
Raw
Full Git config for SemanticMerge
[merge]
tool = semanticmerge
[mergetool]
prompt = false
keepBackup = false
[mergetool "semanticmerge"]
cmd = C:/Users/Alice/AppData/Local/PlasticSCM4/semanticmerge/semanticmergetool.exe -d \"$LOCAL\" -s \"$REMOTE\" -b \"$BASE\" -r \"$MERGED\"
trustExitCode = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment