Skip to content

Instantly share code, notes, and snippets.

View arcadepro's full-sized avatar
🍅

arcadepro arcadepro

🍅
1 follower · 5 following
  • The Hermit Cave
  • United Kingdom
View GitHub Profile
@arcadepro
arcadepro / gist:3e63c9327953a40a45f1
Last active August 29, 2015 14:05 — forked from daniellee/gist:5446026
[merge]
tool = p4merge
keepBackup = false
[mergetool "p4merge"]
cmd = p4merge.exe /\"$BASE/\" /\"$LOCAL/\" /\"$REMOTE/\" /\"$MERGED/\"
trustExitCode = false
keepBackup = false
[diff]
tool = p4merge
guitool = p4merge
@arcadepro
arcadepro / setup_p4merge.cmd
Last active August 29, 2015 14:05 — forked from daredude/setup_p4merge.cmd
git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd 'p4merge.exe \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"'
git config --global diff.tool p4merge
git config --global difftool.p4merge.cmd 'p4merge.exe \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"'