Created
June 4, 2010 18:40
-
-
Save mallipeddi/425783 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/sh | |
| LOCAL=$1 | |
| REMOTE=$2 | |
| BASE=$3 | |
| araxiscompare -nowait -2 "$LOCAL" "$REMOTE" |
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
| [diff] | |
| tool = araxisgitdifftool | |
| renames = true | |
| [difftool "araxisgitdifftool"] | |
| cmd = araxisgitdifftool.sh "$LOCAL" "$REMOTE" "$BASE" | |
| [difftool] | |
| prompt = false | |
| [mergetool "araxismergetool"] | |
| cmd = araxiscompare -3 -merge -wait $LOCAL $BASE $REMOTE $MERGED | |
| [merge] | |
| tool = araxismergetool |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment