Mercurial > hg > easyhg
comparison easyhg-merge-osx.sh @ 215:43ecb0dcc44e
* OS/X: Add icon (not sure this is working though)
* Merge script, etc
author | Chris Cannam |
---|---|
date | Wed, 05 Jan 2011 15:58:34 +0000 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
211:290a95b5ceae | 215:43ecb0dcc44e |
---|---|
1 #!/bin/bash | |
2 echo Args are: $@ 1>&2 | |
3 if [ "$#" -lt 3 ]; then | |
4 echo Insufficient arguments: $@ | |
5 exit 2 | |
6 fi | |
7 while [ "$#" -gt 3 ]; do | |
8 shift | |
9 done | |
10 /Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge \ | |
11 -left "$1" -merge "$1" -ancestor "$2" -right "$3" | |
12 |