Last active
May 10, 2017 11:26
-
-
Save teopeurt/8b570a71fe5bcf939b706abaaa5b90a7 to your computer and use it in GitHub Desktop.
This depends on p4merge shell script - allows using p4merge as visual merge.
This file contains hidden or 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 | |
| # chmod a+x ~/bin/p4diff | |
| # git config --global diff.external p4diff | |
| [ $# -eq 7 ] && ~/bin/p4merge "$2" "$5" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment