Skip to content

Instantly share code, notes, and snippets.

@jasper-d

jasper-d/.gitconfig

Created July 2, 2018 11:44
Show Gist options
  • Save jasper-d/2d46cd62e9681918b6884b25194746c5 to your computer and use it in GitHub Desktop.
Save jasper-d/2d46cd62e9681918b6884b25194746c5 to your computer and use it in GitHub Desktop.
Download ZIP
mergetool.exe .gitconfig
Raw
.gitconfig
[diff]
guitool = PlasticSCM5
tool = PlasticSCM5
[merge]
tool = PlasticSCM5
[difftool "PlasticSCM5"]
path = \"C:/Program Files/PlasticSCM5/client/mergetool.exe\"
cmd = \"C:/Program Files/PlasticSCM5/client/mergetool.exe\" -s=\"$LOCAL\" -d=\"$REMOTE\"
[mergetool "PlasticSCM5"]
path = \"C:/Program Files/PlasticSCM5/client/mergetool.exe\"
cmd = \"C:/Program Files/PlasticSCM5/client/mergetool.exe\" -s=\"$LOCAL\" -d=\"$REMOTE\" -b=\"$BASE\" -r=\"$MERGED\" --automatic
[difftool]
prompt = false
[mergetool]
prompt = false
keepbackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment