Created
June 6, 2011 16:32
-
-
Save askedrelic/1010592 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| /bin/p4merge | |
| #!/bin/bash | |
| for arg; do [[ $arg = /* ]] || arg=$PWD/$arg; absargs+=("$arg"); done; | |
| /Applications/p4merge.app/Contents/Resources/launchp4merge "${absargs[@]}" | |
| .gitconfig | |
| [merge] | |
| tool = p4merge | |
| [mergetool] | |
| keepBackup = false | |
| prompt = false | |
| [difftool] | |
| prompt = false |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment