Created
April 8, 2014 15:21
-
-
Save miguelSantirso/10141643 to your computer and use it in GitHub Desktop.
Custom Git mergetool that opens remote and local with the default app
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 | |
| open $1 # Remote | |
| # open $2 # Local | |
| open $3 # Merged (same as local in most configs) | |
| echo # New line | |
| echo Compare, merge and save. | |
| read -p "Finished (yes/cancel)? " -n 1 -r | |
| echo # (optional) move to a new line | |
| if [[ ! $REPLY =~ ^[Yy]$ ]] | |
| then | |
| exit 1 | |
| fi | |
| exit 0 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Por ahora solo está probado en OSX y con archivos .fla