Skip to content

Instantly share code, notes, and snippets.

@simplyvikram
Created January 23, 2014 20:10
Show Gist options
  • Save simplyvikram/8585914 to your computer and use it in GitHub Desktop.
Save simplyvikram/8585914 to your computer and use it in GitHub Desktop.
[user]
name = vikram singh
email = [email protected]
[credential]
helper = osxkeychain
[core]
editor = vim
[merge]
tool = p4mergetool
keepBackup = false
[mergetool "p4mergetool"]
cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
keepTemporaries = false
trustExitCode = false
keepBackup = false
[diff]
external = p4diff
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment