Last active
July 11, 2018 11:50
-
-
Save jmvrbanac/5248151 to your computer and use it in GitHub Desktop.
Setting up p4merge and diff on Mac OSX
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/sh | |
| [ $# -eq 7 ] && /usr/local/bin/p4merge "$2" "$PWD/$5" |
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/sh | |
| /Applications/p4merge.app/Contents/MacOS/p4merge $* |
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
| # Other Stuff | |
| [merge] | |
| tool = p4merge | |
| keepBackup = false | |
| [mergetool "p4merge"] | |
| 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