Skip to content

Instantly share code, notes, and snippets.

@AliceWaddicor

AliceWaddicor/Git SemanticMerge section

Created August 8, 2014 17:04
Show Gist options
  • Save AliceWaddicor/781bef7600a294f2a7f6 to your computer and use it in GitHub Desktop.
Save AliceWaddicor/781bef7600a294f2a7f6 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
Git SemanticMerge section
[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