Created
February 1, 2018 19:26
-
-
Save treyharris/620f9b50b2ad6bd16e8d771856388d09 to your computer and use it in GitHub Desktop.
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/bash | |
| dir=$PWD | |
| until [ -e "$dir/.git" ]; do | |
| if [ "$dir" == "/" ]; then | |
| echo "This isn't a git working dir" >&2 | |
| exit 1; | |
| fi | |
| dir=`dirname "$dir"` | |
| done | |
| open -a FileMerge -n -W --args -left "$1" -right "$2" -merge "$dir" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment