Skip to content

Instantly share code, notes, and snippets.

King-Wizard

Block or report user

Report or block King-Wizard

Hide content and notifications from this user.

Learn more about blocking users

Contact Support about this user’s behavior.

Learn more about reporting abuse

Report abuse
View GitHub Profile
@King-Wizard
King-Wizard / .gitconfig
Last active Aug 29, 2015 — forked from samsalisbury/.gitconfig
Git diff and merge with p4merge (OSX)
View .gitconfig
[merge]
keepBackup = false
tool = p4merge
[mergetool "p4merge"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "\"$PWD/$BASE\"" "\"$PWD/$REMOTE\"" "\"$PWD/$LOCAL\"" "\"$PWD/$MERGED\""
keepTemporaries = false
trustExitCode = false
keepBackup = false
[diff]
tool = p4merge
You can’t perform that action at this time.